Text format cleanup
This was prompted by conversations with Evolving Web, and there is no ticket.
I've split everything up into individual commits to try to make it easier to follow what I was attempting to do.
Please review the changes and determine if (a) it makes sense to make these changes, (b) there is nothing you would change if it was up to you, and (c) that it all works.