Did a coding-style pass on the existing codebase, mostly following the
One True Brace Style.