Cleanup: Move flatten-trie to loader.