More build system refactoring.