3379 with user-inputted text escaping container
3379 add it to all userstuff, even non-paragraphs, because the parser can be funny
Rebase and tweak the whitespace on pre a bit to make wrapping nicer