Fixup inconsistent whitespace and alignment.