Removing dependency on Pair.