Correct indentation

Same result as #4202 except now as three commits to help reduce confusion with the diffs.