Making the build system more flexible.