Whitespace fixes for r62195, remove out-of-context comment