Whitespace "fixes"

More whitespace fixings. I split the commits per file to allow for easy reverting or easier conflict resolution with other work.