whitespace fixes after #653