Clean up the way predicates and types are organized.