Fix TupleConverter generation