Reorganize make_tuple_if_not_nested