Clean up the builder a tad.