Pair and tuple related refactorings