Merge "Clang: change previous tautological-compare fixes."