Minor indentation cleanup

No actual code changes, just a crap-ton of indentation cleanup (and a
few //end comments) to facilitate code-folding.