Fix highlighting in no cherry picking.