BUG-7464: Refactor TrieMapIterator