Clean up types to use the form suggested in the coding guidelines.