More Work on the Comparator Upgrade.