Trie fixes (expansion + refinement)