Merge "Move some common functionality to AbstractResolverComparator."