Slight change in StringTree (tests) and PrefixTree to reduce class size.