Merge "Remove errors/warnings from tautological comparisons."