Begin some refactoring of cursor key/value manipulation.
More key/value refactoring.