Whitespace and misc. other tidy-ups.