More simplification on KeyRange.