More work on the build phase.