Tweak build system a bit.