Simplify build, remove wrapper.