These whitespace fixes do not belong in the same commit as the functional changes.  A separate commit in the same pull request is reasonable.