Misc whitespace tidying.