Remove make_type(), use $^ and  instead.