Some more intentionally low controversial formatting.

I made these changes before we started discussing.