Additional fixes for spacing/tabbing issues when building.
Fixes gh-2632
Merge pull request #2786 from EricDunsworth/v3.0-build-spacing

Additional fixes for spacing/tabbing issues when building.