Some more intentionally low controversial formatting.

I made these changes before we started discussing.
I do like having indents for switch statements. Is that configurable?