ENH: More whitespace removals ...