Initial preparation for paragraph numbering.
Clean up some <pre>... lines that were too long.
Adjust markup boo boos that cause problems when paragraph numbers are generated.