Fix a bunch of indentation errors.

Maybe that whitespace merge flag was not so great an idea.
Missed a spot