Another cleanup to the build system