More indentation corrections

Found out that Boris had done even more of his atrocious space indenting
in other files, so I had to fix that also.