Improve build system a little.