Yet more whitespace tweaks