Another step in refactoring the build system.
Nearing completion of build refactorings.