Update Pair.
Fix last remnants in CycGraph.