fix #97, deprecate KeyValueDefinition and related KeyLocator, ElementLocator, and ValueLocator interfaces