Clean up a bunch of busted indentation and trailing spaces.

May as well go with 4sp instead of the previous tab majority.