Rejigged the build scripts.