BREAKING CHANGE: KeyValuePair<,> is really confusing for talking about hashes and sorted sets; this fixes that, but changes the API