Additional fixes for spacing/tabbing issues when building.

Fixes gh-2632