Get rid of unnecessary tuple conversions