r6196: Make the comparisons consistent with in the same expression.