In the process of refactoring the build system further.