* Handle duplicate keys better during enumeration.
* Speed up searches in the in-memory map more.