Repotted a lot of the Trie stuff.