Misc restyling.
Merge pull request #5550 from kevingranade/random-acts-of-indention

Misc restyling.