[4.2] Cleanup Whitespace Again

A wish people would set their text editors to trim trailing whitespace on save. :/