Trivial: Remove trailing whitespace and some reindentation.