Some more intentionally low controversial formatting.

I made these changes before we started discussing.
Yes, it's one of the options that I think no one commented on in the other pull request.