There are places where the comparator is not important as long as the ordering is consistent, and the default comparator is used. This assumes that the key actually has a default comparator. This diff makes explicit use of the ProofComparator where possible so updating the key type will not be an issue as long as it is managed by the comparator. There is no change in behavior.