Break a few lines to avoid the line merging logic in format.py

In a few cases this looks silly, but mostly it's helpful to see the
siblings nodes at the same level of indentation.

Inconsistencies in indentation, line length and wrapping <p> was
intentionally left, since those changes can be automated.