Correct indentation

Same result as #4202 except now as three commits to help reduce confusion with the diffs.

Use meld or something more intelligent to view the difference please - github's diff is rather misleading.