More whitespace cleanup

If the number of lines touched is disconcerting, remember you can view
just the non-whitespace alterations with git show -w (or git diff -w)