Simplify tuple_cat a bit

~300 lines