Finishing the switch to types.h and the resulting cleanup.