Remove 1393137 calls to comparator_wrapper