Move things around in the build script to get a bit of reuse.