Swapped usage of Pairs to map of maps