Fix calls to renamed __make_type