Using trie throughout Lustre simplification