Yet more awesome whitespace tweaks