More consistency cleanup, begin HuffmanTree object