Minor tweaks and additions.
First pass at a more complete trie implementation.