Refactor to allow implementing splitting pairs.
Implement splitting pairs (once).