Remove not-a-tree nonsense, get generic trie working again.