Refactoring in prep for moving stricter conflict requirements over to conflicting_pair_finder.