Problem with iterator types not having their type set correctly, fixed.
Heaven knows how it wasn't breaking other things. Also, key and value
iterators are now just a single iterator - value iterators are an
unnecessary complication.