Merge "Fix a tautological assert."