Merge "Improve ParallelMoveResolver to work with pairs."