Add more functions to the binary trie and start using the common header file.