Moved canonization functions to radix trie source files