Some progress, got to fix `make_tuple_type`.