Type system cleaned up.