whitespace: Various style changes.
whitespace: More style fixes.