Extend, tweak, fix, and misc whitespace kills