More simplification on KeyRange.
Merge commit '088bc711f8aaff2657f46f2713d08bcd8a438bd9'