Slightly improving the build system.