Allow more type changes to be generated