Fix #2095: correct the indentation.

This also made it obvious some code was (functionally correctly)
repeated, so deleted that too.
1 file changed