whitespace cosmetics: Reindent a few lines and break a few excessively long lines.