Rejigged build process somewhat.