Move ComparisonCompactor optimization in a separate pull