Change tuple_trie_leaf to only have a tuple and a count, not a simple_tuple. Preparing the way for adding derivation depths.