Trie code cleanups.