Improvements to type building.