Additional fixes spacing/tabbing issues when building.
Fixes gh-2632