Improved forward_as_tuple and tuple_cat