Simplify the build even more.