Reorganized changes to make_type