Simplify make_type