Decruft the build a bit.