texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/ParserNonXS.pm (_enter_index_entry), tp/Texinfo/XS/parsetexi/api.c (build_single_index_data), tp/Texinfo/Convert/*.pm, tp/Texinfo/Common.pm, tp/Texinfo/Structuring.pm, tp/Texinfo/Transformations.pm, tp/Texinfo/Translations.pm, tp/init/chm.pm: change index structure key names to have more specific names.
Date: Thu, 29 Sep 2022 10:33:53 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new fe978f0432 * tp/Texinfo/ParserNonXS.pm (_enter_index_entry), 
tp/Texinfo/XS/parsetexi/api.c (build_single_index_data), 
tp/Texinfo/Convert/*.pm, tp/Texinfo/Common.pm, tp/Texinfo/Structuring.pm, 
tp/Texinfo/Transformations.pm, tp/Texinfo/Translations.pm, tp/init/chm.pm: 
change index structure key names to have more specific names.
fe978f0432 is described below

commit fe978f043293646952b6b00cae376abadfec4ebd
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Sep 29 16:33:38 2022 +0200

    * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
    tp/Texinfo/XS/parsetexi/api.c (build_single_index_data),
    tp/Texinfo/Convert/*.pm, tp/Texinfo/Common.pm,
    tp/Texinfo/Structuring.pm, tp/Texinfo/Transformations.pm,
    tp/Texinfo/Translations.pm, tp/init/chm.pm: change index structure key
    names to have more specific names.
---
 ChangeLog                                          |    9 +
 tp/Texinfo/Common.pm                               |    2 +-
 tp/Texinfo/Convert/Converter.pm                    |    2 +-
 tp/Texinfo/Convert/DocBook.pm                      |   14 +-
 tp/Texinfo/Convert/HTML.pm                         |   30 +-
 tp/Texinfo/Convert/IXIN.pm                         |    4 +-
 tp/Texinfo/Convert/Plaintext.pm                    |   20 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |    6 +-
 tp/Texinfo/ParserNonXS.pm                          |   20 +-
 tp/Texinfo/Structuring.pm                          |    8 +-
 tp/Texinfo/Transformations.pm                      |   12 +-
 tp/Texinfo/Translations.pm                         |   10 +-
 tp/Texinfo/XS/parsetexi/api.c                      |   12 +-
 tp/init/chm.pm                                     |   12 +-
 tp/t/automatic_nodes.t                             |    4 +-
 .../results/converters_tests/at_commands_in_raw.pl |   16 +-
 tp/t/results/converters_tests/complex_nestings.pl  |   90 +-
 .../converters_tests/definition_commands.pl        | 1406 ++++++++++----------
 tp/t/results/converters_tests/form_feeds.pl        |   18 +-
 .../converters_tests/frenchspacing_and_code.pl     |   80 +-
 .../index_entry_in_preformatted.pl                 |   48 +-
 .../printindex_merged_indices_code_style.pl        |   80 +-
 .../references_to_top_no_top_output.pl             |   32 +-
 .../converters_tests/test_deftypefnnewline.pl      |  268 ++--
 .../converters_tests/things_before_setfilename.pl  |   12 +-
 .../things_before_setfilename_no_element.pl        |   12 +-
 tp/t/results/coverage/commands.pl                  |   12 +-
 tp/t/results/coverage/def.pl                       |  210 +--
 tp/t/results/coverage/formats_titles.pl            |   12 +-
 tp/t/results/coverage/multitable.pl                |   12 +-
 tp/t/results/coverage/preformatted.pl              |   12 +-
 .../coverage/punctuation_in_line_commands.pl       |   16 +-
 tp/t/results/coverage/table.pl                     |   48 +-
 .../results/coverage_braces/heading_in_footnote.pl |   12 +-
 tp/t/results/def/all_commands.pl                   |  398 +++---
 tp/t/results/def/all_commands_delimiters.pl        |  704 +++++-----
 .../def/all_commands_delimiters_printindex.pl      |  892 ++++++-------
 tp/t/results/def/all_commands_printindex.pl        |  506 +++----
 tp/t/results/def/ampchar.pl                        |   16 +-
 tp/t/results/def/code_in_def.pl                    |   14 +-
 tp/t/results/def/def_defx_mismatch.pl              |   28 +-
 tp/t/results/def/defx_after_comment.pl             |   28 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |   28 +-
 tp/t/results/def/defx_after_empty_line.pl          |   28 +-
 .../def/defx_after_empty_line_in_example.pl        |   28 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |   28 +-
 .../def/defx_after_preformatted_with_text.pl       |   28 +-
 tp/t/results/def/defx_after_text.pl                |   28 +-
 tp/t/results/def/defx_in_example.pl                |   28 +-
 tp/t/results/def/double_command.pl                 |   56 +-
 tp/t/results/def/empty_def_arguments.pl            |   14 +-
 tp/t/results/def/empty_def_command.pl              |   42 +-
 tp/t/results/def/empty_deftype.pl                  |   60 +-
 tp/t/results/def/end_of_line_protect_at_end.pl     |   14 +-
 tp/t/results/def/end_of_lines_protected.pl         |   14 +-
 .../def/end_of_lines_protected_in_footnote.pl      |   14 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |   66 +-
 .../def/inter_item_commands_in_def_in_example.pl   |   66 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |   14 +-
 tp/t/results/def/no_category_or_no_name.pl         |   14 +-
 tp/t/results/def/not_closed.pl                     |   42 +-
 tp/t/results/def/omit_def_space.pl                 |   36 +-
 tp/t/results/def/protected_brace.pl                |   14 +-
 tp/t/results/def/ref_in_def.pl                     |   36 +-
 tp/t/results/def/space_in_def_for_index.pl         |   36 +-
 tp/t/results/def/wrong_braces_simple.pl            |  126 +-
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   28 +-
 tp/t/results/float/cindex_in_caption.pl            |   16 +-
 tp/t/results/float/complex_float.pl                |   48 +-
 tp/t/results/float/float_copying.pl                |   64 +-
 .../char_latin1_latin1_in_refs.pl                  |   96 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |   96 +-
 .../char_latin2_latin2_in_refs.pl                  |   16 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |   64 +-
 tp/t/results/formatting/float_copying.pl           |   96 +-
 tp/t/results/heading/heading_in_copying.pl         |   16 +-
 .../deftypefnnewline_for_copying_after.pl          |   36 +-
 .../deftypefnnewline_for_copying_before.pl         |   36 +-
 .../results/html_tests/index_and_node_same_name.pl |   16 +-
 tp/t/results/html_tests/index_below.pl             |   12 +-
 tp/t/results/indices/complex_recursive_synindex.pl |   96 +-
 tp/t/results/indices/def_syn_indices.pl            |  112 +-
 ...default_cp_index_and_one_letter_syncodeindex.pl |   32 +-
 tp/t/results/indices/double_index_entry.pl         |   48 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   64 +-
 tp/t/results/indices/double_syncodeindex.pl        |   32 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   68 +-
 tp/t/results/indices/encoding_index_ascii.pl       |  880 ++++++------
 .../encoding_index_ascii_enable_encoding.pl        |  880 ++++++------
 tp/t/results/indices/encoding_index_latin1.pl      |  880 ++++++------
 .../encoding_index_latin1_enable_encoding.pl       |  880 ++++++------
 tp/t/results/indices/encoding_index_utf8.pl        |  880 ++++++------
 .../indices/encoding_index_utf8_enable_encoding.pl |  880 ++++++------
 tp/t/results/indices/explicit_sort_key.pl          |   58 +-
 tp/t/results/indices/ftable_vtable.pl              |  112 +-
 tp/t/results/indices/image_lines_count.pl          |   16 +-
 tp/t/results/indices/image_text_lines_count.pl     |   16 +-
 tp/t/results/indices/index_entries_locations.pl    |   64 +-
 .../indices/index_entry_before_first_node.pl       |   12 +-
 tp/t/results/indices/index_entry_before_node.pl    |   16 +-
 tp/t/results/indices/index_entry_in_footnote.pl    |   16 +-
 .../index_entry_in_footnote_different_node_end.pl  |   32 +-
 .../indices/index_entry_in_footnote_separate.pl    |   32 +-
 .../multiple_index_text_sortas_seeentry_seealso.pl |   44 +-
 .../indices/printindex_index_entry_in_copying.pl   |   84 +-
 ...rintindex_index_entry_in_copying_in_footnote.pl |   16 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |   84 +-
 .../indices/printindex_with_space_before.pl        |   16 +-
 .../indices/same_index_entry_merged_indices.pl     |   36 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |   96 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |  112 +-
 tp/t/results/indices/seealso_duplicate.pl          |   32 +-
 tp/t/results/indices/seeentry.pl                   |   64 +-
 tp/t/results/indices/subentries.pl                 |  128 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   28 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   32 +-
 tp/t/results/indices/syncodeindex_to_plain.pl      |   48 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   48 +-
 .../indices/unknown_then_known_index_entry.pl      |   12 +-
 tp/t/results/indices/w_lines_count.pl              |   16 +-
 tp/t/results/info_tests/before_node_and_section.pl |   12 +-
 tp/t/results/info_tests/colon_in_index_entry.pl    |   68 +-
 .../info_tests/colons_in_index_entries_and_node.pl |   96 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |   96 +-
 tp/t/results/info_tests/def_in_copying.pl          |   72 +-
 .../end_of_line_command_in_node_lines.pl           |   16 +-
 tp/t/results/info_tests/index_entry_at_end_node.pl |   16 +-
 .../multitable_anchor_and_index_entry.pl           |   32 +-
 .../info_tests/nested_multitable_anchor_index.pl   |   32 +-
 tp/t/results/info_tests/test_index.pl              |  294 ++--
 .../results/invalid_nestings/block_not_matching.pl |   14 +-
 tp/t/results/invalid_nestings/center.pl            |   12 +-
 .../invalid_nestings/def_in_style_command.pl       |   14 +-
 .../def_not_closed_in_menu_description.pl          |   14 +-
 tp/t/results/invalid_nestings/in_table.pl          |   80 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   12 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |   28 +-
 .../invalid_nestings/on_index_entry_line.pl        |   12 +-
 .../invalid_nestings/section_on_defx_line.pl       |   14 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   12 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  112 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   64 +-
 tp/t/results/languages/multiple.pl                 |   72 +-
 tp/t/results/languages/multiple_in_preamble.pl     |   72 +-
 .../languages/multiple_in_preamble_before_node.pl  |   48 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |   64 +-
 .../languages/multiple_lang_chapters_latex.pl      |   64 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |   64 +-
 tp/t/results/languages/simple.pl                   |   24 +-
 tp/t/results/languages/unknown_region.pl           |   24 +-
 tp/t/results/latex_tests/brace_in_index.pl         |   50 +-
 tp/t/results/latex_tests/indices.pl                |   78 +-
 tp/t/results/layout/no_monolithic.pl               |   16 +-
 tp/t/results/macro/backslash_in_arg.pl             |   64 +-
 tp/t/results/macro/macro_in_index_commands.pl      |   64 +-
 tp/t/results/menu/menu_in_deffn.pl                 |   18 +-
 .../misc_commands/comment_space_command_on_line.pl |   16 +-
 tp/t/results/misc_commands/index_entries.pl        |   24 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  160 +--
 tp/t/results/morecoverage/texi_formatting.pl       |  160 +--
 tp/t/results/moreindices/double_index_entry.pl     |   48 +-
 tp/t/results/moreindices/index_no_node.pl          |  168 +--
 tp/t/results/moreindices/index_split.pl            |  304 ++---
 tp/t/results/moreindices/index_split_nodes.pl      |  304 ++---
 tp/t/results/moreindices/nodes_before_top.pl       |  208 +--
 .../nodes_before_top_and_sections_monolithic.pl    |  240 ++--
 .../moreindices/nodes_before_top_no_nodes.pl       |  208 +--
 tp/t/results/moreindices/nodes_before_top_nodes.pl |  208 +--
 tp/t/results/moreindices/split_chapter_index.pl    |  192 +--
 .../moresectioning/placed_things_before_element.pl |   12 +-
 .../inter_item_commands_in_multitable.pl           |   36 +-
 .../at_commands_glued_in_example.pl                |   12 +-
 .../at_commands_glued_in_paragraph.pl              |   12 +-
 tp/t/results/preformatted/def_in_example.pl        |   14 +-
 tp/t/results/sectioning/no_element.pl              |   12 +-
 .../sectioning/placed_things_before_element.pl     |   12 +-
 .../sectioning/placed_things_before_node.pl        |   12 +-
 tp/t/results/value/value_in_index_commands.pl      |   64 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   18 +-
 tp/t/results/xtable/block_commands_in_table.pl     |   80 +-
 tp/t/results/xtable/empty_item_itemx.pl            |   36 +-
 .../results/xtable/inter_item_commands_in_table.pl |  288 ++--
 .../inter_item_commands_in_table_in_example.pl     |   12 +-
 tp/t/results/xtable/table_nested.pl                |  144 +-
 184 files changed, 9256 insertions(+), 9241 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16bb277b64..c186b354ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-09-29  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_enter_index_entry),
+       tp/Texinfo/XS/parsetexi/api.c (build_single_index_data),
+       tp/Texinfo/Convert/*.pm, tp/Texinfo/Common.pm,
+       tp/Texinfo/Structuring.pm, tp/Texinfo/Transformations.pm,
+       tp/Texinfo/Translations.pm, tp/init/chm.pm: change index structure key
+       names to have more specific names.
+
 2022-09-29  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_enter_index_entry): initialize 
'index_entries'
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 8e85b18877..217e43c196 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -2682,7 +2682,7 @@ sub _relate_index_entry_to_table_entry($)
       delete $index_command->{'parent'};
       $item->{'extra'}->{'index_entry'}
         = $index_command->{'extra'}->{'index_entry'};
-      $item->{'extra'}->{'index_entry'}->{'command'} = $item;
+      $item->{'extra'}->{'index_entry'}->{'entry_element'} = $item;
   }
 }
 
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index f777f8fbcc..909eca9850 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1303,7 +1303,7 @@ sub comma_index_subentries_tree {
   my ($self, $entry) = @_;
 
   my @contents;
-  my $tmp = $entry->{'command'};
+  my $tmp = $entry->{'entry_element'};
   while ($tmp->{'extra'} and $tmp->{'extra'}->{'subentry'}) {
     $tmp = $tmp->{'extra'}->{'subentry'};
     push @contents, {'text' => ', '}, $tmp->{'args'}->[0];
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 931ecdffd2..490fee0df5 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -574,11 +574,11 @@ sub _index_entry($$)
       if ($index_entry->{'in_code'});
 
     $result .= "<primary>";
-    $result .= $self->_convert({'contents' => $index_entry->{'content'}});
+    $result .= $self->_convert({'contents' => 
$index_entry->{'entry_content'}});
     $result .= "</primary>";
 
     # Add any index subentries.
-    my $tmp = $index_entry->{'command'};
+    my $tmp = $index_entry->{'entry_element'};
     my $level = "secondary";
     while ($tmp->{'extra'}->{'subentry'}) {
       $result .= "<$level>";
@@ -587,14 +587,16 @@ sub _index_entry($$)
       $result .= "</$level>";
       $level = "tertiary";
     }
-    if ($index_entry->{'command'}->{'extra'}->{'seeentry'}) {
+    if ($index_entry->{'entry_element'}->{'extra'}->{'seeentry'}) {
       $result .= "<see>";
-      $result .= $self->_convert({'contents' => 
$index_entry->{'command'}->{'extra'}->{'seeentry'}->{'args'}});
+      $result .= $self->_convert({'contents'
+        => 
$index_entry->{'entry_element'}->{'extra'}->{'seeentry'}->{'args'}});
       $result .= "</see>";
     }
-    if ($index_entry->{'command'}->{'extra'}->{'seealso'}) {
+    if ($index_entry->{'entry_element'}->{'extra'}->{'seealso'}) {
       $result .= "<seealso>";
-      $result .= $self->_convert({'contents' => 
$index_entry->{'command'}->{'extra'}->{'seealso'}->{'args'}});
+      $result .= $self->_convert({'contents'
+        => $index_entry->{'entry_element'}->{'extra'}->{'seealso'}->{'args'}});
       $result .= "</seealso>";
     }
 
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index a9d3e6111b..d25c805498 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5062,7 +5062,7 @@ sub _convert_printindex_command($$$$)
       }
 
       my $subentries_tree = 
$self->comma_index_subentries_tree($index_entry_ref);
-      my @entry_contents = @{$index_entry_ref->{'content'}};
+      my @entry_contents = @{$index_entry_ref->{'entry_content'}};
       push @entry_contents, @{$subentries_tree->{'contents'}}
         if (defined($subentries_tree));
       my $entry_tree = {'contents' => \@entry_contents};
@@ -5080,23 +5080,23 @@ sub _convert_printindex_command($$$$)
 
       next if ($entry !~ /\S/);
       next if ($self->get_conf('NO_TOP_NODE_OUTPUT')
-               and defined($index_entry_ref->{'node'})
-               and $index_entry_ref->{'node'}->{'extra'}
-               and $index_entry_ref->{'node'}->{'extra'}->{'normalized'}
-               and $index_entry_ref->{'node'}->{'extra'}->{'normalized'} eq 
'Top');
+               and defined($index_entry_ref->{'entry_node'})
+               and $index_entry_ref->{'entry_node'}->{'extra'}
+               and $index_entry_ref->{'entry_node'}->{'extra'}->{'normalized'}
+               and $index_entry_ref->{'entry_node'}->{'extra'}->{'normalized'} 
eq 'Top');
       $entry = '<code>' .$entry .'</code>' if ($index_entry_ref->{'in_code'});
-      my $entry_href = $self->command_href($index_entry_ref->{'command'});
+      my $entry_href = 
$self->command_href($index_entry_ref->{'entry_element'});
       my $associated_command;
       if ($self->get_conf('NODE_NAME_IN_INDEX')) {
-        $associated_command = $index_entry_ref->{'node'};
+        $associated_command = $index_entry_ref->{'entry_node'};
         if (!defined($associated_command)) {
           $associated_command
-            = $self->command_node($index_entry_ref->{'command'});
+            = $self->command_node($index_entry_ref->{'entry_element'});
         }
       }
       if (!$associated_command) {
         $associated_command
-          = $self->command_root_element_command($index_entry_ref->{'command'});
+          = 
$self->command_root_element_command($index_entry_ref->{'entry_element'});
         if (!$associated_command) {
           # Use Top if not associated command found
           $associated_command
@@ -8156,8 +8156,8 @@ sub _prepare_index_entries($)
     foreach my $index_name (sort(keys(%$index_names))) {
       foreach my $index_entry 
(@{$index_names->{$index_name}->{'index_entries'}}) {
         my $region = '';
-        $region = "$index_entry->{'region'}->{'cmdname'}-"
-          if (defined($index_entry->{'region'}));
+        $region = "$index_entry->{'entry_region'}->{'cmdname'}-"
+          if (defined($index_entry->{'entry_region'}));
         my @contents = @{$index_entry->{'content_normalized'}};
         my $trimmed_contents
           = Texinfo::Common::trim_spaces_comment_from_content(\@contents);
@@ -8174,8 +8174,8 @@ sub _prepare_index_entries($)
           die if ($nr == 0);
         }
         $self->{'seen_ids'}->{$target} = 1;
-        $self->{'targets'}->{$index_entry->{'command'}} = {'target' => $target,
-                                                        };
+        $self->{'targets'}->{$index_entry->{'entry_element'}}
+                                              = {'target' => $target, };
       }
     }
   }
@@ -9344,12 +9344,12 @@ sub output_internal_links($)
       foreach my $letter_entry (@{$index_entries_by_letter->{$index_name}}) {
         foreach my $index_entry (@{$letter_entry->{'entries'}}) {
           my $href;
-          $href = $self->command_href($index_entry->{'command'}, '');
+          $href = $self->command_href($index_entry->{'entry_element'}, '');
           # Obtain term by converting to text
           my $converter_options = {%options};
           $converter_options->{'code'} = $index_entry->{'in_code'};
           my $index_term = Texinfo::Convert::Text::convert_to_text(
-               {'contents' => $index_entry->{'content'}}, $converter_options);
+               {'contents' => $index_entry->{'entry_content'}}, 
$converter_options);
           if (defined($index_term) and $index_term =~ /\S/) {
             $out_string .= $href if (defined($href));
             $out_string .= "\t$index_name\t";
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 4227c353b0..47fc0c0947 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -680,7 +680,7 @@ sub output_ixin($$)
       my $dts_entries_nr = 0;
       my $dts_in_code = $index_names->{$index_name}->{'in_code'};
       foreach my $dts_entry (@{$entries->{$index_name}}) {
-        my $node = $dts_entry->{'node'};
+        my $node = $dts_entry->{'entry_node'};
         my $associated_node_id;
         if (defined($node)) {
           $associated_node_id = $self->_associated_node_id(undef,
@@ -688,7 +688,7 @@ sub output_ixin($$)
         } else {
           $associated_node_id = -1;
         }
-        my $entry = $self->convert_tree({'contents' => 
$dts_entry->{'content'}});
+        my $entry = $self->convert_tree({'contents' => 
$dts_entry->{'entry_content'}});
         $dts_text_result .= $self->ixin_open_element('dtsentry',
                                                 [['nodeid', 
$associated_node_id]]);
         $dts_text_result .= $self->ixin_open_element('dtsterm');
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 4085f088aa..a3e7196299 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1274,10 +1274,10 @@ sub process_printindex($$;$)
   foreach my $entry (@{$self->{'index_entries'}->{$index_name}}) {
     my $line_nr;
 
-    if (defined 
($self->{'index_entries_line_location'}->{$entry->{'command'}})) {
-      $line_nr = 
$self->{'index_entries_line_location'}->{$entry->{'command'}}->{'lines'};
+    if (defined 
($self->{'index_entries_line_location'}->{$entry->{'entry_element'}})) {
+      $line_nr = 
$self->{'index_entries_line_location'}->{$entry->{'entry_element'}}->{'lines'};
       # ignore index entries in special regions that haven't been seen
-    } elsif ($entry->{'region'}) {
+    } elsif ($entry->{'entry_region'}) {
       $ignored_entries{$entry} = 1;
       next;
     }
@@ -1285,10 +1285,10 @@ sub process_printindex($$;$)
     my $node;
     # priority given to the location determined dynamically as the
     # index entry may be in footnote.
-    if 
(defined($self->{'index_entries_line_location'}->{$entry->{'command'}}->{'node'}))
 {
-      $node = 
$self->{'index_entries_line_location'}->{$entry->{'command'}}->{'node'};
-    } elsif (defined($entry->{'node'})) {
-      $node = $entry->{'node'};
+    if 
(defined($self->{'index_entries_line_location'}->{$entry->{'entry_element'}}->{'node'}))
 {
+      $node = 
$self->{'index_entries_line_location'}->{$entry->{'entry_element'}}->{'node'};
+    } elsif (defined($entry->{'entry_node'})) {
+      $node = $entry->{'entry_node'};
     }
     $entry_nodes{$entry} = $node;
     if (!defined($node)) {
@@ -1311,7 +1311,7 @@ sub process_printindex($$;$)
 
   foreach my $entry (@{$self->{'index_entries'}->{$index_name}}) {
     next if ($ignored_entries{$entry});
-    my $entry_tree = {'contents' => $entry->{'content'}};
+    my $entry_tree = {'contents' => $entry->{'entry_content'}};
     my $subentries_tree = $self->comma_index_subentries_tree($entry);
     if ($entry->{'in_code'}) {
       $entry_tree->{'type'} = '_code';
@@ -1347,7 +1347,7 @@ sub process_printindex($$;$)
         sprintf(__("Index entry in \@%s with : produces invalid Info: %s"),
                 $entry->{'index_at_command'},
                 Texinfo::Convert::Texinfo::convert_to_texinfo($entry_tree)),
-                        $entry->{'command'}->{'source_info'});
+                        $entry->{'entry_element'}->{'source_info'});
     }
 
     my $entry_nr = '';
@@ -1392,7 +1392,7 @@ sub process_printindex($$;$)
       if (!$self->{'index_entries_no_node'}->{$entry}) {
         $self->line_warn($self,
              sprintf(__("entry for index `%s' outside of any node"),
-                        $index_name), $entry->{'command'}->{'source_info'});
+                        $index_name), 
$entry->{'entry_element'}->{'source_info'});
         $self->{'index_entries_no_node'}->{$entry} = 1;
       }
     } else {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index c0fb00a728..1300ba730d 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -359,8 +359,8 @@ sub _index_entry($$)
   if ($element->{'extra'} and $element->{'extra'}->{'index_entry'}) {
     my $index_entry = $element->{'extra'}->{'index_entry'};
     my $attribute = [['index', $index_entry->{'index_name'}]];
-    push @$attribute, ['number', $index_entry->{'number'}]
-        if (defined($index_entry->{'number'}));
+    push @$attribute, ['number', $index_entry->{'entry_number'}]
+        if (defined($index_entry->{'entry_number'}));
     # in case the index is not a default index, or the style of the
     # entry (in code or not) is not the default for this index
     if ($self->{'indices_information'}) {
@@ -379,7 +379,7 @@ sub _index_entry($$)
     push @{$self->{'document_context'}}, {'monospace' => [0]};
     $self->{'document_context'}->[-1]->{'monospace'}->[-1] = 1
       if ($index_entry->{'in_code'});
-    $result .= $self->_convert({'contents' => $index_entry->{'content'}});
+    $result .= $self->_convert({'contents' => 
$index_entry->{'entry_content'}});
     pop @{$self->{'document_context'}};
     $result .= $self->txi_markup_close_element('indexterm');
     return $result;
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 45a50ecf44..05ea9e263e 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2738,10 +2738,10 @@ sub _enter_index_entry($$$$$$$)
   my $index_entry = { 'index_name'           => $index_name,
                       'index_at_command'     => $command,
                       'index_type_command'   => $command_container,
-                      'content'              => $content,
+                      'entry_content'        => $content,
                       'content_normalized'   => $content_normalized,
-                      'command'              => $current,
-                      'number'               => $number,
+                      'entry_element'        => $current,
+                      'entry_number'         => $number,
                       'index_ignore_chars'   => {},
                     };
   # gather set txiindex*ignore information
@@ -2755,9 +2755,9 @@ sub _enter_index_entry($$$$$$$)
     $index_entry->{'sortas'} = $current->{'extra'}->{'sortas'};
   }
   if (@{$self->{'regions_stack'}}) {
-    $index_entry->{'region'} = $self->{'regions_stack'}->[-1];
+    $index_entry->{'entry_region'} = $self->{'regions_stack'}->[-1];
   } elsif ($self->{'current_node'}) {
-    $index_entry->{'node'} = $self->{'current_node'};
+    $index_entry->{'entry_node'} = $self->{'current_node'};
   } elsif (!$self->{'current_section'}) {
     $self->_line_warn(sprintf(__("entry for index `%s' outside of any node"),
                              $index_name), $source_info);
@@ -6701,7 +6701,7 @@ should allow to find the index associated to the index 
entry.
 
 =end comment
 
-=item content
+=item entry_content
 
 An array reference corresponding to the index entry content.
 
@@ -6710,20 +6710,20 @@ An array reference corresponding to the index entry 
content.
 An array reference corresponding to the index entry content, independent
 of the current language.
 
-=item command
+=item entry_element
 
 The element in the parsed tree associated with the @-command holding the
 index entry.
 
-=item node
+=item entry_node
 
 The node in the parsed tree containing the index entry.
 
-=item number
+=item entry_number
 
 The number of the index entry.
 
-=item region
+=item entry_region
 
 The region command (C<@copying>, C<@titlepage>) containing the index entry,
 if it is in such an environement.
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 769107b3d1..685595461c 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1712,17 +1712,17 @@ sub sort_indices($$$;$)
     my $index_letter_hash = {};
     foreach my $entry (@{$index_entries->{$index_name}}) {
       my $entry_key = index_entry_sort_string($entry,
-                                  {'contents' => $entry->{'content'}},
-                                  $entry->{'sortas'}, $options);
+                                 {'contents' => $entry->{'entry_content'}},
+                                              $entry->{'sortas'}, $options);
       $index_entries_sort_strings->{$entry} = $entry_key;
       if ($entry_key !~ /\S/) {
         $registrar->line_warn($customization_information,
                      sprintf(__("empty index key in \@%s"),
                                  $entry->{'index_at_command'}),
-                        $entry->{'command'}->{'source_info'});
+                        $entry->{'entry_element'}->{'source_info'});
       } else {
         my $sortable_entry = {'entry' => $entry, 'key' => $entry_key,
-           'number' => $entry->{'number'},
+           'number' => $entry->{'entry_number'},
            'index_at_command' => $entry->{'index_at_command'}};
 
         if ($sort_by_letter) {
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index d2234e2c9d..7aeea6cb9c 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -323,23 +323,23 @@ sub _reassociate_to_node($$$$)
     push @{$new_node->{'extra'}->{'menus'}}, $current;
   } elsif ($current->{'extra'} and $current->{'extra'}->{'index_entry'}) {
     if ($previous_node
-        and (!$current->{'extra'}->{'index_entry'}->{'node'}
-             or $current->{'extra'}->{'index_entry'}->{'node'} ne 
$previous_node)) {
+        and (!$current->{'extra'}->{'index_entry'}->{'entry_node'}
+             or $current->{'extra'}->{'index_entry'}->{'entry_node'} ne 
$previous_node)) {
       print STDERR "Bug: index entry $current (".
         Texinfo::Convert::Texinfo::convert_to_texinfo(
-            {'contents' => $current->{'extra'}->{'index_entry'}->{'content'}})
+            {'contents' => 
$current->{'extra'}->{'index_entry'}->{'entry_content'}})
          .") not in previous node $previous_node\n";
       print STDERR "  previous node: "
         
.Texinfo::Convert::Texinfo::root_heading_command_to_texinfo($previous_node)."\n";
-      if ($current->{'extra'}->{'index_entry'}->{'node'}) {
+      if ($current->{'extra'}->{'index_entry'}->{'entry_node'}) {
         print STDERR "  current node: ".
          Texinfo::Convert::Texinfo::root_heading_command_to_texinfo(
-                            
$current->{'extra'}->{'index_entry'}->{'node'})."\n";
+                            
$current->{'extra'}->{'index_entry'}->{'entry_node'})."\n";
       } else {
         print STDERR "  current node not set\n";
       }
     }
-    $current->{'extra'}->{'index_entry'}->{'node'} = $new_node;
+    $current->{'extra'}->{'index_entry'}->{'entry_node'} = $new_node;
   }
   return ($current);
 }
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index 031120eabd..d4c819cb3a 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -340,17 +340,17 @@ sub complete_indices($)
     next if (not 
defined($self->{'index_names'}->{$index_name}->{'index_entries'}));
     foreach my $entry 
(@{$self->{'index_names'}->{$index_name}->{'index_entries'}}) {
       $entry->{'in_code'} = $self->{'index_names'}->{$index_name}->{'in_code'};
-      if (not defined($entry->{'content'})) {
+      if (not defined($entry->{'entry_content'})) {
         my ($index_entry, $index_contents_normalized);
-        my $def_command = $entry->{'command'}->{'extra'}->{'def_command'};
+        my $def_command = 
$entry->{'entry_element'}->{'extra'}->{'def_command'};
 
-        my $def_parsed_hash = 
$entry->{'command'}->{'extra'}->{'def_parsed_hash'};
+        my $def_parsed_hash = 
$entry->{'entry_element'}->{'extra'}->{'def_parsed_hash'};
         if ($def_parsed_hash and $def_parsed_hash->{'class'}
             and $def_command) {
           # Use the document language that was current when the command was
           # used for getting the translation.
           my $entry_language
-             = $entry->{'command'}->{'extra'}->{'documentlanguage'};
+             = $entry->{'entry_element'}->{'extra'}->{'documentlanguage'};
           if ($def_command eq 'defop'
               or $def_command eq 'deftypeop'
               or $def_command eq 'defmethod'
@@ -383,7 +383,7 @@ sub complete_indices($)
           }
         }
         if ($index_entry->{'contents'}) {
-          $entry->{'content'} = [@{$index_entry->{'contents'}}];
+          $entry->{'entry_content'} = [@{$index_entry->{'contents'}}];
           $entry->{'content_normalized'} = $index_contents_normalized;
         }
       }
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index 730dcd860e..977def9214 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -783,12 +783,12 @@ build_single_index_data (INDEX *i)
              newSVpv (command_name(e->index_at_command), 0));
       STORE2("index_type_command",
              newSVpv (command_name(e->index_type_command), 0));
-      STORE2("command",
+      STORE2("entry_element",
              newRV_inc ((SV *)e->command->hv));
-      STORE2("number", newSViv (entry_number));
+      STORE2("entry_number", newSViv (entry_number));
       if (e->region)
         {
-          STORE2("region", newRV_inc ((SV *)e->region->hv));
+          STORE2("entry_region", newRV_inc ((SV *)e->region->hv));
         }
       if (e->content)
         {
@@ -812,14 +812,14 @@ build_single_index_data (INDEX *i)
           if (contents_array)
             {
               /* Copy the reference to the array. */
-              STORE2("content", newRV_inc ((SV *)(AV *)SvRV(*contents_array)));
+              STORE2("entry_content", newRV_inc ((SV *)(AV 
*)SvRV(*contents_array)));
 
               STORE2("content_normalized",
                      newRV_inc ((SV *)(AV *)SvRV(*contents_array)));
             }
           else
             {
-              STORE2("content", newRV_inc ((SV *)newAV ()));
+              STORE2("entry_content", newRV_inc ((SV *)newAV ()));
               STORE2("content_normalized", newRV_inc ((SV *)newAV ()));
             }
         }
@@ -827,7 +827,7 @@ build_single_index_data (INDEX *i)
         ; /* will be set in Texinfo::Common::complete_indices */
 
       if (e->node)
-        STORE2("node", newRV_inc ((SV *)e->node->hv));
+        STORE2("entry_node", newRV_inc ((SV *)e->node->hv));
       if (e->sortas)
         STORE2("sortas", newSVpv_utf8 (e->sortas, 0));
 
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index b69d825ac9..9340a9bc85 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -247,11 +247,15 @@ sub chm_init($)
   if ($index_entries) {
     foreach my $index_name (sort(keys(%$index_entries))) {
       foreach my $index_entry_ref (@{$index_entries->{$index_name}}) {
-        my $origin_href = $self->command_href($index_entry_ref->{'command'}, 
'');
+        my $origin_href
+            = $self->command_href($index_entry_ref->{'entry_element'}, '');
         my $entry = _chm_convert_tree_to_text($self,
-                               {'contents' => $index_entry_ref->{'content'}},
-                               {'code' => $index_entry_ref->{'in_code'}});
-        print $hhk_fh "<LI> <OBJECT type=\"text/sitemap\">\n<param 
name=\"Name\" value=\"$entry\">\n<param name=\"Local\" 
value=\"$origin_href\">\n</OBJECT> </LI>\n"
+                         {'contents' => $index_entry_ref->{'entry_content'}},
+                         {'code' => $index_entry_ref->{'in_code'}});
+        print $hhk_fh "<LI> <OBJECT type=\"text/sitemap\">\n"
+                      ."<param name=\"Name\" value=\"$entry\">\n"
+                      ."<param name=\"Local\" value=\"$origin_href\">\n"
+                      ."</OBJECT> </LI>\n"
          if ($entry =~ /\S/);
       }
     }
diff --git a/tp/t/automatic_nodes.t b/tp/t/automatic_nodes.t
index ec9b2f099f..158e1a3979 100644
--- a/tp/t/automatic_nodes.t
+++ b/tp/t/automatic_nodes.t
@@ -203,7 +203,7 @@ is 
(Texinfo::Convert::Texinfo::convert_to_texinfo($labels->{'chap'}->{'extra'}->
 @end menu
 ', 'reassociated menu is correct');
 #print STDERR join('|', keys(%{$index_names->{'cp'}->{'index_entries'}}))."\n";
-is ($labels->{'chap'}, $index_names->{'cp'}->{'index_entries'}->[0]->{'node'}, 
+is ($labels->{'chap'}, 
$index_names->{'cp'}->{'index_entries'}->[0]->{'entry_node'}, 
   'index entry reassociated');
 #print STDERR Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
 
@@ -227,6 +227,6 @@ is ($labels->{'chap'}, 
$index_names->{'cp'}->{'index_entries'}->[0]->{'node'},
 #                                       $nodes_list, $targets_list, $labels);
 # ($index_names, $merged_indices) = $parser->indices_information();
 # ($labels, $targets_list, $nodes_list) = $parser->labels_information();
-# is ($labels->{'SEE-ALSO'}, 
$index_names->{'cp'}->{'index_entries'}->[0]->{'node'},
+# is ($labels->{'SEE-ALSO'}, 
$index_names->{'cp'}->{'index_entries'}->[0]->{'entry_node'},
 #   'index entry reassociated duplicate node ignored');
 
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 3b531b2935..5fbe418887 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -643,16 +643,16 @@ $result_trees{'at_commands_in_raw'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1005,10 +1005,10 @@ 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[0
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[3];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
+$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[3];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15];
 $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[15]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[4];
 $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[16]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[4];
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 091b705d03..b996d954ae 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -316,20 +316,20 @@ $result_trees{'complex_nestings'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'defun',
-                      'node' => {},
-                      'number' => 1
+                      'index_type_command' => 'defun'
                     },
                     'original_def_cmdname' => 'defun'
                   },
@@ -436,20 +436,20 @@ $result_trees{'complex_nestings'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 2,
                       'in_code' => 1,
                       'index_at_command' => 'defunx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'defun',
-                      'node' => {},
-                      'number' => 2
+                      'index_type_command' => 'defun'
                     },
                     'original_def_cmdname' => 'defunx',
                     'spaces_before_argument' => ' '
@@ -596,20 +596,20 @@ $result_trees{'complex_nestings'} = {
                               'name' => {}
                             },
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [
+                              'content_normalized' => [
                                 {}
                               ],
-                              'content_normalized' => [
+                              'entry_content' => [
                                 {}
                               ],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 3,
                               'in_code' => 1,
                               'index_at_command' => 'deffn',
                               'index_ignore_chars' => {},
                               'index_name' => 'fn',
-                              'index_type_command' => 'deffn',
-                              'node' => {},
-                              'number' => 3
+                              'index_type_command' => 'deffn'
                             },
                             'original_def_cmdname' => 'deffn'
                           },
@@ -705,20 +705,20 @@ $result_trees{'complex_nestings'} = {
                                       'name' => {}
                                     },
                                     'index_entry' => {
-                                      'command' => {},
-                                      'content' => [
+                                      'content_normalized' => [
                                         {}
                                       ],
-                                      'content_normalized' => [
+                                      'entry_content' => [
                                         {}
                                       ],
+                                      'entry_element' => {},
+                                      'entry_node' => {},
+                                      'entry_number' => 1,
                                       'in_code' => 1,
                                       'index_at_command' => 'defvar',
                                       'index_ignore_chars' => {},
                                       'index_name' => 'vr',
-                                      'index_type_command' => 'defvar',
-                                      'node' => {},
-                                      'number' => 1
+                                      'index_type_command' => 'defvar'
                                     },
                                     'original_def_cmdname' => 'defvar'
                                   },
@@ -828,20 +828,20 @@ $result_trees{'complex_nestings'} = {
                                       'name' => {}
                                     },
                                     'index_entry' => {
-                                      'command' => {},
-                                      'content' => [
+                                      'content_normalized' => [
                                         {}
                                       ],
-                                      'content_normalized' => [
+                                      'entry_content' => [
                                         {}
                                       ],
+                                      'entry_element' => {},
+                                      'entry_node' => {},
+                                      'entry_number' => 2,
                                       'in_code' => 1,
                                       'index_at_command' => 'defvarx',
                                       'index_ignore_chars' => {},
                                       'index_name' => 'vr',
-                                      'index_type_command' => 'defvar',
-                                      'node' => {},
-                                      'number' => 2
+                                      'index_type_command' => 'defvar'
                                     },
                                     'original_def_cmdname' => 'defvarx',
                                     'spaces_before_argument' => ' '
@@ -1303,10 +1303,10 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
@@ -1321,10 +1321,10 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -1343,10 +1343,10 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -1359,10 +1359,10 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -1378,10 +1378,10 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_nestings'}{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[0];
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index afc5301083..a6a4016e0b 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -239,20 +239,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -491,20 +491,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -777,20 +777,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -1094,20 +1094,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -1336,20 +1336,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -1579,20 +1579,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -1822,20 +1822,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -2065,20 +2065,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 8
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -2308,20 +2308,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 9
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -2602,20 +2602,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 10
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -2896,20 +2896,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 11
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3190,20 +3190,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 12
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3484,20 +3484,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 13,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 13
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -3778,20 +3778,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 14,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 14
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4072,20 +4072,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 15,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 15
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4366,20 +4366,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 16,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 16
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4660,20 +4660,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 17,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 17
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -4954,20 +4954,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 18,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 18
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5129,20 +5129,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 19,
                   'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 19
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -5255,20 +5255,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 20,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 20
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5382,20 +5382,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 21,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 21
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5509,20 +5509,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 22,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 22
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5636,20 +5636,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 23,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 23
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5763,20 +5763,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 24,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 24
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -5907,20 +5907,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 25,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 25
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6051,20 +6051,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 26,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 26
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6195,20 +6195,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 27,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 27
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6339,20 +6339,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 28,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 28
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6483,20 +6483,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 29,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 29
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6627,20 +6627,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 30,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 30
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6771,20 +6771,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 31,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 31
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -6915,20 +6915,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 32,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 32
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -7059,20 +7059,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 33,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 33
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -7280,20 +7280,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 34,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 34
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -7454,20 +7454,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 35,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 35
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -7629,20 +7629,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 36,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 36
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -7907,20 +7907,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 37,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 37
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -7998,20 +7998,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 38,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 38
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -9360,20 +9360,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 39,
                   'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 39
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -9755,20 +9755,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 40,
                   'in_code' => 1,
                   'index_at_command' => 'defspecx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 40
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspecx',
                 'spaces_before_argument' => ' '
@@ -10039,20 +10039,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 41,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 41
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -10421,20 +10421,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 42,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 42
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -10679,20 +10679,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -10890,28 +10890,28 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -11209,20 +11209,20 @@ $result_trees{'definition_commands'} = {
                       'type' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 43,
                       'in_code' => 1,
                       'index_at_command' => 'deftypefn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deftypefn',
-                      'node' => {},
-                      'number' => 43
+                      'index_type_command' => 'deftypefn'
                     },
                     'original_def_cmdname' => 'deftypefn'
                   },
@@ -11500,20 +11500,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 44,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 44
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -11794,20 +11794,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 45,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 45
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -12332,20 +12332,20 @@ $result_trees{'definition_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 46,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 46
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -12646,20 +12646,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 47,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 47
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -12927,20 +12927,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 48,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 48
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13209,20 +13209,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 49,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 49
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13491,20 +13491,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 50,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 50
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -13773,20 +13773,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 51,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 51
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14055,20 +14055,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 52,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 52
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14371,20 +14371,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 53,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 53
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -14687,20 +14687,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 54,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 54
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15003,20 +15003,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 55,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 55
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15319,20 +15319,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 56,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 56
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15635,20 +15635,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 57,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 57
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -15951,20 +15951,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 58,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 58
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -16267,20 +16267,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 59,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 59
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -16583,20 +16583,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 60,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 60
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -16899,20 +16899,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 61,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 61
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -17214,20 +17214,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 62,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 62
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -17480,20 +17480,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 63,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 63
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -17747,20 +17747,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 64,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 64
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -18014,20 +18014,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 65,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 65
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -18281,20 +18281,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 66,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 66
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -18548,20 +18548,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 67,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 67
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -18832,20 +18832,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 68,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 68
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -19116,20 +19116,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 69,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 69
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -19400,20 +19400,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 70,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 70
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -19684,20 +19684,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 71,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 71
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -19968,20 +19968,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 72,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 72
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -20252,20 +20252,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 73,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 73
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -20536,20 +20536,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 74,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 74
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -20820,20 +20820,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 75,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 75
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -21104,20 +21104,20 @@ $result_trees{'definition_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 76,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 76
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefnx',
                 'spaces_before_argument' => ' '
@@ -21237,10 +21237,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -21273,10 +21273,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -21313,10 +21313,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -21358,10 +21358,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0];
@@ -21392,10 +21392,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
@@ -21426,10 +21426,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0];
@@ -21460,10 +21460,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0];
@@ -21494,10 +21494,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0];
@@ -21528,10 +21528,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0];
@@ -21568,10 +21568,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0];
@@ -21608,10 +21608,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0];
@@ -21648,10 +21648,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0];
@@ -21688,10 +21688,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0];
@@ -21728,10 +21728,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0];
@@ -21768,10 +21768,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0];
@@ -21808,10 +21808,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[12]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0];
@@ -21848,10 +21848,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0];
@@ -21888,10 +21888,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[15];
@@ -21913,10 +21913,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0];
@@ -21932,10 +21932,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
@@ -21951,10 +21951,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0];
@@ -21970,10 +21970,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[3]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0];
@@ -21989,10 +21989,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[4]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0];
@@ -22008,10 +22008,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0];
@@ -22029,10 +22029,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0];
@@ -22050,10 +22050,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0];
@@ -22071,10 +22071,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0];
@@ -22092,10 +22092,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0];
@@ -22113,10 +22113,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0];
@@ -22134,10 +22134,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0];
@@ -22155,10 +22155,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[12]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0];
@@ -22176,10 +22176,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0];
@@ -22197,10 +22197,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[15];
@@ -22227,10 +22227,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
@@ -22253,10 +22253,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[1];
@@ -22279,10 +22279,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1];
@@ -22318,10 +22318,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[3]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0];
@@ -22332,10 +22332,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[4]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[5]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -22508,10 +22508,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0];
@@ -22560,10 +22560,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
@@ -22599,10 +22599,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0];
@@ -22652,10 +22652,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0];
@@ -22690,10 +22690,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[1]{'contents'}[0];
@@ -22719,12 +22719,12 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[1]{'contents'}[0];
@@ -22763,10 +22763,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -22804,10 +22804,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0];
@@ -22846,10 +22846,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -22918,10 +22918,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[1];
@@ -22961,10 +22961,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0];
@@ -23000,10 +23000,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0];
@@ -23039,10 +23039,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0];
@@ -23078,10 +23078,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[3]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0];
@@ -23117,10 +23117,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[4]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0];
@@ -23156,10 +23156,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0];
@@ -23199,10 +23199,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0];
@@ -23242,10 +23242,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0];
@@ -23285,10 +23285,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0];
@@ -23328,10 +23328,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0];
@@ -23371,10 +23371,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0];
@@ -23414,10 +23414,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0];
@@ -23457,10 +23457,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[12]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0];
@@ -23500,10 +23500,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0];
@@ -23543,10 +23543,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[15];
@@ -23586,10 +23586,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0];
@@ -23623,10 +23623,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0];
@@ -23660,10 +23660,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0];
@@ -23697,10 +23697,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[3]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0];
@@ -23734,10 +23734,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[4]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0];
@@ -23771,10 +23771,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[5]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0];
@@ -23810,10 +23810,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0];
@@ -23849,10 +23849,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[7]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0];
@@ -23888,10 +23888,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[8]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0];
@@ -23927,10 +23927,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[9]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0];
@@ -23966,10 +23966,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[10]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0];
@@ -24005,10 +24005,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[11]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0];
@@ -24044,10 +24044,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[12]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0];
@@ -24083,10 +24083,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[13]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0];
@@ -24122,10 +24122,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'args'}[0]{'contents'}[4];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14];
+$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'definition_commands'}{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[14]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'contents'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[15];
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index b03cdbd832..a5c9099e58 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -656,20 +656,20 @@ $result_trees{'form_feeds'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -1078,10 +1078,10 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0];
+$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'form_feeds'}{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 75e938cff1..33ee3d90c3 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -552,28 +552,28 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -854,28 +854,28 @@ $result_trees{'frenchspacing_and_code'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -1412,28 +1412,28 @@ $result_trees{'frenchspacing_and_code'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1714,28 +1714,28 @@ $result_trees{'frenchspacing_and_code'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -1887,12 +1887,12 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
@@ -1927,12 +1927,12 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
+$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[3];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
@@ -2000,12 +2000,12 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[1];
@@ -2040,12 +2040,12 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0];
+$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[5];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[1]{'contents'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index edeb31cc53..0655b17cce 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -187,16 +187,16 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -256,16 +256,16 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 2,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 2
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -302,16 +302,16 @@ $result_trees{'index_entry_in_preformatted'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 3,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 3
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -399,10 +399,10 @@ 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[0]{'pare
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -410,18 +410,18 @@ 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'cont
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'};
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5];
+$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[3];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
diff --git 
a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
index 5269c97a3f..45d202b94a 100644
--- a/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
+++ b/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
@@ -256,16 +256,16 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -303,16 +303,16 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'vindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'vindex',
               'index_ignore_chars' => {},
               'index_name' => 'vr',
-              'index_type_command' => 'vindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'vindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -350,16 +350,16 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -472,16 +472,16 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'cdiindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cdiindex',
               'index_ignore_chars' => {},
               'index_name' => 'cdi',
-              'index_type_command' => 'cdiindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cdiindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -594,16 +594,16 @@ $result_trees{'printindex_merged_indices_code_style'} = {
           'cmdname' => 'ddiindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'ddiindex',
               'index_ignore_chars' => {},
               'index_name' => 'ddi',
-              'index_type_command' => 'ddiindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'ddiindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -695,26 +695,26 @@ 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[8]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'args'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[9]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[10]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[11]{'args'}[0];
@@ -727,10 +727,10 @@ 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[14]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'args'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[15]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[16]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[17]{'args'}[0];
@@ -743,10 +743,10 @@ 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[20]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'args'}[0];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21];
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[3];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[21]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[22]{'parent'}
 = $result_trees{'printindex_merged_indices_code_style'}{'contents'}[4];
 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[4]{'contents'}[23]{'args'}[0];
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index e94f7ebc3a..1b76d24ba9 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -651,16 +651,16 @@ $result_trees{'references_to_top_no_top_output'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1014,16 +1014,16 @@ $result_trees{'references_to_top_no_top_output'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1354,10 +1354,10 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[14]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[16]{'contents'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[16];
@@ -1412,10 +1412,10 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[1]{'
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3];
+$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[3];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[5]{'args'}[0];
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 6a1f3d11da..4d00d5c58c 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -313,20 +313,20 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -467,20 +467,20 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -650,28 +650,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -826,28 +826,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1002,28 +1002,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1193,28 +1193,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1339,20 +1339,20 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -1551,20 +1551,20 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -1705,20 +1705,20 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1888,28 +1888,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 8
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -2064,28 +2064,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 9
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -2240,28 +2240,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2431,28 +2431,28 @@ $result_trees{'test_deftypefnnewline'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2577,20 +2577,20 @@ $result_trees{'test_deftypefnnewline'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 10
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -2712,10 +2712,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
@@ -2735,10 +2735,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
@@ -2761,12 +2761,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
@@ -2787,12 +2787,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
@@ -2813,12 +2813,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
@@ -2841,12 +2841,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
@@ -2863,10 +2863,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
@@ -2893,10 +2893,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[1];
@@ -2916,10 +2916,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[1];
@@ -2942,12 +2942,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[1];
@@ -2968,12 +2968,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[1];
@@ -2994,12 +2994,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[1];
@@ -3022,12 +3022,12 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[1];
@@ -3044,10 +3044,10 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0];
+$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[3];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[1];
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index dfeeb52443..fb45caff85 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -743,15 +743,15 @@ $result_trees{'things_before_setfilename'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 1
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1265,9 +1265,9 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0];
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 0d1fa01afd..0cc8f6b548 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -743,15 +743,15 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 1
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1113,9 +1113,9 @@ 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0];
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index ea3a2f78a4..f3234de5a3 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -367,15 +367,15 @@ $result_trees{'commands'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -504,9 +504,9 @@ 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[4];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 $result_trees{'commands'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'commands'}{'contents'}[0];
 
$result_trees{'commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'commands'}{'contents'}[0]{'contents'}[6]{'args'}[0];
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 69e81d3fe5..2b9e7cf153 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -91,19 +91,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -333,19 +333,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -517,19 +517,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -620,19 +620,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 4
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -724,19 +724,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 5
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -829,19 +829,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 6
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -934,19 +934,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 7
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1039,19 +1039,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 8
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1169,19 +1169,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 9
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1247,19 +1247,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 10
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1335,19 +1335,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 11
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1418,19 +1418,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 12
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx'
               },
@@ -1546,19 +1546,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 13,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 13
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1699,19 +1699,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 14,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 14
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1852,19 +1852,19 @@ $result_trees{'def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 15,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 15
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1952,9 +1952,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
@@ -1985,9 +1985,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
@@ -2010,9 +2010,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
@@ -2024,9 +2024,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
@@ -2038,9 +2038,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0];
@@ -2052,9 +2052,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0];
@@ -2066,9 +2066,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[4]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0];
@@ -2081,9 +2081,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0];
@@ -2100,9 +2100,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[6]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0];
@@ -2111,9 +2111,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[7]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0];
@@ -2123,9 +2123,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[8]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0];
@@ -2135,9 +2135,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'co
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[9]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0];
@@ -2153,9 +2153,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'c
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[10]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[11]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[11]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[11];
@@ -2174,9 +2174,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'c
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[12]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[13]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[13];
@@ -2195,9 +2195,9 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'c
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[14]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[15]{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[15];
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index aaf4936e93..3e12234bb7 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -423,15 +423,15 @@ $result_trees{'formats_titles'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -731,9 +731,9 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'co
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6];
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 7c38ac4c42..e9738f5887 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -286,15 +286,15 @@ $result_trees{'multitable'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 1,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'number' => 1
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -628,9 +628,9 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index d71a60350d..82e29f247d 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -155,15 +155,15 @@ $result_trees{'preformatted'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 1
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -306,9 +306,9 @@ 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index c2d1716e0f..427713f19d 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -629,16 +629,16 @@ $result_trees{'punctuation_in_line_commands'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -914,10 +914,10 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[9]{'par
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[13]{'args'}[0];
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 017ad18603..8bc92cdb07 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -259,15 +259,15 @@ $result_trees{'table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -313,15 +313,15 @@ $result_trees{'table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -372,15 +372,15 @@ $result_trees{'table'} = {
                           'cmdname' => 'kindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 1,
                               'index_at_command' => 'kindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'ky',
-                              'index_type_command' => 'kindex',
-                              'number' => 1
+                              'index_type_command' => 'kindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -433,15 +433,15 @@ $result_trees{'table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'number' => 2
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -661,34 +661,34 @@ 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'table'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl 
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index a8fcc9c39c..47ff04982f 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -78,15 +78,15 @@ $result_trees{'heading_in_footnote'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 1,
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
-                          'index_type_command' => 'cindex',
-                          'number' => 1
+                          'index_type_command' => 'cindex'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -150,9 +150,9 @@ 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'heading_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 475f6fbc11..b11dadffbc 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -59,19 +59,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'number' => 1
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -211,19 +211,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -348,19 +348,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -516,19 +516,19 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 3
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -669,19 +669,19 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 4
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -851,27 +851,27 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 5
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1026,27 +1026,27 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 6
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1187,19 +1187,19 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'number' => 2
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -1340,19 +1340,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'number' => 3
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1508,19 +1508,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'number' => 4
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1675,27 +1675,27 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'number' => 5
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1865,27 +1865,27 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'number' => 6
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2039,27 +2039,27 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'number' => 7
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2198,27 +2198,27 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'number' => 8
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2358,19 +2358,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'number' => 1
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -2516,19 +2516,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'number' => 9
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -2674,19 +2674,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'defmac',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defmac',
-                  'number' => 10
+                  'index_type_command' => 'defmac'
                 },
                 'original_def_cmdname' => 'defmac'
               },
@@ -2832,19 +2832,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'number' => 11
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -2975,19 +2975,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvar',
-                  'number' => 7
+                  'index_type_command' => 'defvar'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3148,19 +3148,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvar',
-                  'number' => 8
+                  'index_type_command' => 'defvar'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3291,19 +3291,19 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defopt',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defopt',
-                  'number' => 9
+                  'index_type_command' => 'defopt'
                 },
                 'original_def_cmdname' => 'defopt'
               },
@@ -3465,19 +3465,19 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'number' => 12
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -3624,19 +3624,19 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevar',
-                  'number' => 10
+                  'index_type_command' => 'deftypevar'
                 },
                 'original_def_cmdname' => 'deftypevar'
               },
@@ -3781,27 +3781,27 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'number' => 11
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -3962,27 +3962,27 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypeivar',
-                  'number' => 12
+                  'index_type_command' => 'deftypeivar'
                 },
                 'original_def_cmdname' => 'deftypeivar'
               },
@@ -4142,27 +4142,27 @@ $result_trees{'all_commands'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 13,
                   'in_code' => 1,
                   'index_at_command' => 'defmethod',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defmethod',
-                  'number' => 13
+                  'index_type_command' => 'defmethod'
                 },
                 'original_def_cmdname' => 'defmethod'
               },
@@ -4338,27 +4338,27 @@ $result_trees{'all_commands'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 14,
                   'in_code' => 1,
                   'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod',
-                  'number' => 14
+                  'index_type_command' => 'deftypemethod'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
@@ -4441,9 +4441,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -4462,9 +4462,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
@@ -4481,9 +4481,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
@@ -4505,9 +4505,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
@@ -4527,9 +4527,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
@@ -4552,11 +4552,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
@@ -4577,11 +4577,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
@@ -4601,9 +4601,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
@@ -4623,9 +4623,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
@@ -4647,9 +4647,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
@@ -4670,11 +4670,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
@@ -4697,11 +4697,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
@@ -4721,11 +4721,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[1];
@@ -4743,11 +4743,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[1];
@@ -4766,9 +4766,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
@@ -4788,9 +4788,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[1];
@@ -4810,9 +4810,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
@@ -4832,9 +4832,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
@@ -4852,9 +4852,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
@@ -4876,9 +4876,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
@@ -4896,9 +4896,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[1];
@@ -4921,9 +4921,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[1];
@@ -4944,9 +4944,9 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[1];
@@ -4965,11 +4965,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[1];
@@ -4991,11 +4991,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[1];
@@ -5016,11 +5016,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'arg
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[1];
@@ -5044,11 +5044,11 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'ext
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[1];
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 4603ccbf90..52a7f5276f 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -427,19 +427,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -866,19 +866,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'number' => 1
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -1131,19 +1131,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 2
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1695,19 +1695,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 3
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1868,19 +1868,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 4
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2218,19 +2218,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 5
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2632,19 +2632,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'number' => 2
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -3060,19 +3060,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'number' => 1
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -3474,19 +3474,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'number' => 3
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -3919,27 +3919,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'number' => 4
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -4328,27 +4328,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'number' => 6
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -4770,27 +4770,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 7
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4975,27 +4975,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 8
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5202,27 +5202,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 9
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5429,27 +5429,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 10
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5634,27 +5634,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 11
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5839,27 +5839,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 12
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6066,27 +6066,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 13,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 13
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6293,27 +6293,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 14,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 14
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6498,27 +6498,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 15,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 15
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6703,27 +6703,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 16,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 16
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6930,27 +6930,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 17,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 17
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7157,27 +7157,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 18,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 18
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7362,27 +7362,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 19,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 19
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7567,27 +7567,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 20,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 20
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7811,27 +7811,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 21,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 21
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7990,19 +7990,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 22,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'number' => 22
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -8208,19 +8208,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 23,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 23
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -8426,19 +8426,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 24,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 24
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -8644,19 +8644,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'number' => 5
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -8862,19 +8862,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'number' => 6
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -9113,19 +9113,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 25,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 25
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -9364,19 +9364,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 26,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 26
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -9615,19 +9615,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'number' => 7
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -9866,19 +9866,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'number' => 8
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -10084,19 +10084,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'number' => 2
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -10302,19 +10302,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'number' => 3
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -10553,19 +10553,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'number' => 9
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -10803,19 +10803,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'number' => 4
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -11085,27 +11085,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'number' => 10
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -11375,27 +11375,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'number' => 11
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -11632,27 +11632,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 27,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'number' => 27
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -11889,27 +11889,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 28,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'number' => 28
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -12179,27 +12179,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 29,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 29
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -12469,27 +12469,27 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 30,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'number' => 30
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -12774,19 +12774,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 31,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 31
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -13071,19 +13071,19 @@ $result_trees{'all_commands_delimiters'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 32,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 32
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -13195,9 +13195,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -13251,9 +13251,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
@@ -13286,9 +13286,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
@@ -13359,9 +13359,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
@@ -13382,9 +13382,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
@@ -13429,9 +13429,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
@@ -13483,9 +13483,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
@@ -13538,9 +13538,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
@@ -13592,9 +13592,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
@@ -13649,11 +13649,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
@@ -13702,11 +13702,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
@@ -13760,11 +13760,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
@@ -13788,11 +13788,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1];
@@ -13818,11 +13818,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1];
@@ -13848,11 +13848,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
@@ -13876,11 +13876,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1];
@@ -13904,11 +13904,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
@@ -13934,11 +13934,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
@@ -13964,11 +13964,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
@@ -13992,11 +13992,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
@@ -14020,11 +14020,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1];
@@ -14050,11 +14050,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1];
@@ -14080,11 +14080,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1];
@@ -14108,11 +14108,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1];
@@ -14136,11 +14136,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1];
@@ -14170,11 +14170,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1];
@@ -14195,9 +14195,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1];
@@ -14223,9 +14223,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1];
@@ -14251,9 +14251,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1];
@@ -14279,9 +14279,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1];
@@ -14307,9 +14307,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1];
@@ -14340,9 +14340,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1];
@@ -14373,9 +14373,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
@@ -14406,9 +14406,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
@@ -14439,9 +14439,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1];
@@ -14467,9 +14467,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1];
@@ -14495,9 +14495,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1];
@@ -14528,9 +14528,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1];
@@ -14560,9 +14560,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1];
@@ -14596,11 +14596,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1];
@@ -14634,11 +14634,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1];
@@ -14667,11 +14667,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1];
@@ -14700,11 +14700,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1];
@@ -14738,11 +14738,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1];
@@ -14776,11 +14776,11 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1];
@@ -14816,9 +14816,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1];
@@ -14854,9 +14854,9 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1];
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 1391cc99b4..47053c05cc 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -448,20 +448,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -888,20 +888,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -1154,20 +1154,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1719,20 +1719,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1893,20 +1893,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2244,20 +2244,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2659,20 +2659,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -3088,20 +3088,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -3503,20 +3503,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -3949,28 +3949,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -4359,28 +4359,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -4802,28 +4802,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5008,28 +5008,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 8
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5236,28 +5236,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 9
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5464,28 +5464,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 10
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5670,28 +5670,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 11
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5876,28 +5876,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 12
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6104,28 +6104,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 13,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 13
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6332,28 +6332,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 14,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 14
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6538,28 +6538,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 15,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 15
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6744,28 +6744,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 16,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 16
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6972,28 +6972,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 17,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 17
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7200,28 +7200,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 18,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 18
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7406,28 +7406,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 19,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 19
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7612,28 +7612,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 20,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 20
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -7857,28 +7857,28 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 21,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 21
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -8037,20 +8037,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 22,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 22
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -8256,20 +8256,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 23,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 23
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -8475,20 +8475,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 24,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 24
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -8694,20 +8694,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -8913,20 +8913,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -9165,20 +9165,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 25,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 25
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -9417,20 +9417,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 26,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 26
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -9669,20 +9669,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -9921,20 +9921,20 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'node' => {},
-                  'number' => 8
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -10140,20 +10140,20 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -10359,20 +10359,20 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -10611,20 +10611,20 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'node' => {},
-                  'number' => 9
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -10862,20 +10862,20 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -11145,28 +11145,28 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 10
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -11436,28 +11436,28 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 11
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -11694,28 +11694,28 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 27,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 27
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -11952,28 +11952,28 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 28,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 28
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -12243,28 +12243,28 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 29,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 29
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -12534,28 +12534,28 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 30,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 30
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -12840,20 +12840,20 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 31,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 31
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -13138,20 +13138,20 @@ $result_trees{'all_commands_delimiters_printindex'} = 
{
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 32,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 32
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -13481,10 +13481,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -13538,10 +13538,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
@@ -13574,10 +13574,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
@@ -13648,10 +13648,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
@@ -13672,10 +13672,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
@@ -13720,10 +13720,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1];
@@ -13775,10 +13775,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1];
@@ -13831,10 +13831,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1];
@@ -13886,10 +13886,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1];
@@ -13944,12 +13944,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1];
@@ -13998,12 +13998,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1];
@@ -14057,12 +14057,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1];
@@ -14086,12 +14086,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1];
@@ -14117,12 +14117,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1];
@@ -14148,12 +14148,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1];
@@ -14177,12 +14177,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1];
@@ -14206,12 +14206,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
@@ -14237,12 +14237,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1];
@@ -14268,12 +14268,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
@@ -14297,12 +14297,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
@@ -14326,12 +14326,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1];
@@ -14357,12 +14357,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1];
@@ -14388,12 +14388,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1];
@@ -14417,12 +14417,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1];
@@ -14446,12 +14446,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1];
@@ -14481,12 +14481,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1];
@@ -14507,10 +14507,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1];
@@ -14536,10 +14536,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1];
@@ -14565,10 +14565,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1];
@@ -14594,10 +14594,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1];
@@ -14623,10 +14623,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1];
@@ -14657,10 +14657,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1];
@@ -14691,10 +14691,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1];
@@ -14725,10 +14725,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1];
@@ -14759,10 +14759,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1];
@@ -14788,10 +14788,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1];
@@ -14817,10 +14817,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1];
@@ -14851,10 +14851,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1];
@@ -14884,10 +14884,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1];
@@ -14921,12 +14921,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1];
@@ -14960,12 +14960,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1];
@@ -14994,12 +14994,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1];
@@ -15028,12 +15028,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1];
@@ -15067,12 +15067,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1];
@@ -15106,12 +15106,12 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1];
@@ -15147,10 +15147,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[9
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1];
@@ -15186,10 +15186,10 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[9
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0];
+$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1];
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 9e88c70cfc..eded413cbc 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -80,20 +80,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -233,20 +233,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -371,20 +371,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -540,20 +540,20 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -694,20 +694,20 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -877,28 +877,28 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1053,28 +1053,28 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypeop',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'deftypeop'
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -1215,20 +1215,20 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevr',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypevr'
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -1369,20 +1369,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1538,20 +1538,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defcv',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'defcv'
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -1706,28 +1706,28 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -1897,28 +1897,28 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypecv',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'deftypecv'
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -2072,28 +2072,28 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2232,28 +2232,28 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'node' => {},
-                  'number' => 8
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -2393,20 +2393,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_ignore_chars' => {},
                   'index_name' => 'tp',
-                  'index_type_command' => 'deftp',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deftp'
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -2552,20 +2552,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 9
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -2711,20 +2711,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'defmac',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defmac',
-                  'node' => {},
-                  'number' => 10
+                  'index_type_command' => 'defmac'
                 },
                 'original_def_cmdname' => 'defmac'
               },
@@ -2870,20 +2870,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defspec',
-                  'node' => {},
-                  'number' => 11
+                  'index_type_command' => 'defspec'
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -3014,20 +3014,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvar',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'defvar'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3188,20 +3188,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvar',
-                  'node' => {},
-                  'number' => 8
+                  'index_type_command' => 'defvar'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -3332,20 +3332,20 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'defopt',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defopt',
-                  'node' => {},
-                  'number' => 9
+                  'index_type_command' => 'defopt'
                 },
                 'original_def_cmdname' => 'defopt'
               },
@@ -3507,20 +3507,20 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'node' => {},
-                  'number' => 12
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -3667,20 +3667,20 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 10,
                   'in_code' => 1,
                   'index_at_command' => 'deftypevar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypevar',
-                  'node' => {},
-                  'number' => 10
+                  'index_type_command' => 'deftypevar'
                 },
                 'original_def_cmdname' => 'deftypevar'
               },
@@ -3825,28 +3825,28 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 11,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 11
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -4007,28 +4007,28 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 12,
                   'in_code' => 1,
                   'index_at_command' => 'deftypeivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'deftypeivar',
-                  'node' => {},
-                  'number' => 12
+                  'index_type_command' => 'deftypeivar'
                 },
                 'original_def_cmdname' => 'deftypeivar'
               },
@@ -4188,28 +4188,28 @@ $result_trees{'all_commands_printindex'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 13,
                   'in_code' => 1,
                   'index_at_command' => 'defmethod',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defmethod',
-                  'node' => {},
-                  'number' => 13
+                  'index_type_command' => 'defmethod'
                 },
                 'original_def_cmdname' => 'defmethod'
               },
@@ -4385,28 +4385,28 @@ $result_trees{'all_commands_printindex'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 14,
                   'in_code' => 1,
                   'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod',
-                  'node' => {},
-                  'number' => 14
+                  'index_type_command' => 'deftypemethod'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
@@ -4707,10 +4707,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -4729,10 +4729,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
@@ -4749,10 +4749,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
@@ -4774,10 +4774,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
@@ -4797,10 +4797,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
@@ -4823,12 +4823,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1];
@@ -4849,12 +4849,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1];
@@ -4874,10 +4874,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1];
@@ -4897,10 +4897,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1];
@@ -4922,10 +4922,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1];
@@ -4946,12 +4946,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1];
@@ -4974,12 +4974,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1];
@@ -4999,12 +4999,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1];
@@ -5022,12 +5022,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1];
@@ -5046,10 +5046,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1];
@@ -5069,10 +5069,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1];
@@ -5092,10 +5092,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
@@ -5115,10 +5115,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1];
@@ -5136,10 +5136,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
@@ -5161,10 +5161,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
@@ -5182,10 +5182,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1];
@@ -5208,10 +5208,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1];
@@ -5232,10 +5232,10 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1];
@@ -5254,12 +5254,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1];
@@ -5281,12 +5281,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1];
@@ -5307,12 +5307,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1];
@@ -5336,12 +5336,12 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0];
+$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'contents'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1];
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 3d8dbe3b54..a055f539e1 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -136,27 +136,27 @@ $result_trees{'ampchar'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defop',
-                  'number' => 1
+                  'index_type_command' => 'defop'
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -293,11 +293,11 @@ 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 9f593e5bb0..c57966a86d 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -142,19 +142,19 @@ $result_trees{'code_in_def'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefn',
-                  'number' => 1
+                  'index_type_command' => 'deftypefn'
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -274,9 +274,9 @@ 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 9284f35aac..c3bc47c6a4 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -149,19 +149,19 @@ $result_trees{'def_defx_mismatch'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'number' => 1
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -303,19 +303,19 @@ $result_trees{'def_defx_mismatch'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx',
@@ -423,9 +423,9 @@ 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -444,9 +444,9 @@ 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 7c02332c64..0fe916c91b 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -106,19 +106,19 @@ $result_trees{'defx_after_comment'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -228,19 +228,19 @@ $result_trees{'defx_after_comment'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -309,9 +309,9 @@ 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -326,9 +326,9 @@ 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl 
b/tp/t/results/def/defx_after_comment_in_example.pl
index ee3b711aa7..434b8ca7c8 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -119,19 +119,19 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 1
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -247,19 +247,19 @@ $result_trees{'defx_after_comment_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 2,
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 2
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffnx',
                     'spaces_before_argument' => ' '
@@ -370,9 +370,9 @@ 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -388,9 +388,9 @@ 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 7e05965d13..6c8f9dd90b 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -106,19 +106,19 @@ $result_trees{'defx_after_empty_line'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -216,19 +216,19 @@ $result_trees{'defx_after_empty_line'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -297,9 +297,9 @@ 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0];
@@ -313,9 +313,9 @@ 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl 
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index f091e801e7..2000813767 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -119,19 +119,19 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 1
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -277,19 +277,19 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 2,
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 2
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffnx',
                     'spaces_before_argument' => ' '
@@ -400,9 +400,9 @@ 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -422,9 +422,9 @@ 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index b4857c0ae2..98421942be 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -106,19 +106,19 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -227,19 +227,19 @@ $result_trees{'defx_after_paragraph_end'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx',
@@ -309,9 +309,9 @@ 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -327,9 +327,9 @@ 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index 0a7bc0ad70..48249d0a49 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -119,19 +119,19 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 1
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -240,19 +240,19 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 2,
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 2
+                      'index_type_command' => 'deffn'
                     },
                     'not_after_command' => 1,
                     'original_def_cmdname' => 'deffnx',
@@ -364,9 +364,9 @@ 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -382,9 +382,9 @@ 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index 815d3898b4..963f815681 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -106,19 +106,19 @@ $result_trees{'defx_after_text'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -221,19 +221,19 @@ $result_trees{'defx_after_text'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'not_after_command' => 1,
                 'original_def_cmdname' => 'deffnx',
@@ -303,9 +303,9 @@ 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'a
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -320,9 +320,9 @@ 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'a
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 042dcc9026..24257c6b01 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -119,19 +119,19 @@ $result_trees{'defx_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 1
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -217,19 +217,19 @@ $result_trees{'defx_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 2,
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 2
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffnx',
                     'spaces_before_argument' => ' '
@@ -340,9 +340,9 @@ 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -354,9 +354,9 @@ 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index 1911825b56..b8e490f579 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -318,19 +318,19 @@ $result_trees{'double_command'} = {
                         },
                         'def_role' => 'arg',
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'deffnx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'deffn',
-                          'number' => 1
+                          'index_type_command' => 'deffn'
                         },
                         'not_after_command' => 1,
                         'original_def_cmdname' => 'deffnx',
@@ -356,19 +356,19 @@ $result_trees{'double_command'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -545,19 +545,19 @@ $result_trees{'double_command'} = {
                               'name' => {}
                             },
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [
+                              'content_normalized' => [
                                 {}
                               ],
-                              'content_normalized' => [
+                              'entry_content' => [
                                 {}
                               ],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 1,
                               'index_at_command' => 'defvr',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'defvr',
-                              'number' => 1
+                              'index_type_command' => 'defvr'
                             },
                             'original_def_cmdname' => 'defvr'
                           },
@@ -593,19 +593,19 @@ $result_trees{'double_command'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -721,16 +721,16 @@ 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'ar
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[17]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -753,17 +753,17 @@ 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'ar
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index 3785f532d5..a2cc552fc4 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -106,19 +106,19 @@ $result_trees{'empty_def_arguments'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -645,9 +645,9 @@ 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index 9720e30ca3..c8ce14abe3 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -59,19 +59,19 @@ $result_trees{'empty_def_command'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -209,19 +209,19 @@ $result_trees{'empty_def_command'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -281,19 +281,19 @@ $result_trees{'empty_def_command'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -360,9 +360,9 @@ 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -380,9 +380,9 @@ 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
@@ -391,9 +391,9 @@ 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index af029411e4..92daaf2d1f 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -147,19 +147,19 @@ $result_trees{'empty_deftype'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'number' => 1
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -351,19 +351,19 @@ $result_trees{'empty_deftype'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'number' => 2
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -590,27 +590,27 @@ $result_trees{'empty_deftype'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deftypemethod',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypemethod',
-                  'number' => 3
+                  'index_type_command' => 'deftypemethod'
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },
@@ -816,27 +816,27 @@ $result_trees{'empty_deftype'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' on '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'defmethod',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defmethod',
-                  'number' => 4
+                  'index_type_command' => 'defmethod'
                 },
                 'original_def_cmdname' => 'defmethod'
               },
@@ -931,9 +931,9 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'arg
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -959,9 +959,9 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'arg
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
@@ -991,11 +991,11 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'ext
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
@@ -1022,11 +1022,11 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'arg
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
diff --git a/tp/t/results/def/end_of_line_protect_at_end.pl 
b/tp/t/results/def/end_of_line_protect_at_end.pl
index 07b7a027b8..df895656e0 100644
--- a/tp/t/results/def/end_of_line_protect_at_end.pl
+++ b/tp/t/results/def/end_of_line_protect_at_end.pl
@@ -79,19 +79,19 @@ $result_trees{'end_of_line_protect_at_end'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -131,9 +131,9 @@ 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'conte
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'end_of_line_protect_at_end'}{'contents'}[0];
 $result_trees{'end_of_line_protect_at_end'}{'contents'}[0]{'parent'} = 
$result_trees{'end_of_line_protect_at_end'};
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 8387ca3ae2..fb6c205045 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -201,19 +201,19 @@ $result_trees{'end_of_lines_protected'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -314,9 +314,9 @@ 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index 315d6286af..456a43de9d 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -222,19 +222,19 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                               'name' => {}
                             },
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [
+                              'content_normalized' => [
                                 {}
                               ],
-                              'content_normalized' => [
+                              'entry_content' => [
                                 {}
                               ],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 1,
                               'index_at_command' => 'deffn',
                               'index_ignore_chars' => {},
                               'index_name' => 'fn',
-                              'index_type_command' => 'deffn',
-                              'number' => 1
+                              'index_type_command' => 'deffn'
                             },
                             'original_def_cmdname' => 'deffn'
                           },
@@ -363,9 +363,9 @@ 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl 
b/tp/t/results/def/inter_item_commands_in_def.pl
index deeb9d6de9..5d0a092735 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -106,19 +106,19 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -240,19 +240,19 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -287,15 +287,15 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -416,19 +416,19 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -463,15 +463,15 @@ $result_trees{'inter_item_commands_in_def'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 2,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'number' => 2
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -564,9 +564,9 @@ 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -582,15 +582,15 @@ 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -608,15 +608,15 @@ 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl 
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index 4fdb095b92..b5888dd4d3 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -119,19 +119,19 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 1
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -259,19 +259,19 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 2,
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 2
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffnx',
                     'spaces_before_argument' => ' '
@@ -308,15 +308,15 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -441,19 +441,19 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 3,
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 3
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffnx',
                     'spaces_before_argument' => ' '
@@ -490,15 +490,15 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 2,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'number' => 2
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -627,9 +627,9 @@ 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -646,15 +646,15 @@ 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -673,15 +673,15 @@ 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl 
b/tp/t/results/def/leading_space_in_def_arg.pl
index c70fa718ad..064c73db12 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -86,19 +86,19 @@ $result_trees{'leading_space_in_def_arg'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -167,9 +167,9 @@ 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/def/no_category_or_no_name.pl 
b/tp/t/results/def/no_category_or_no_name.pl
index 5ee05d2dc7..51081022f8 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -292,19 +292,19 @@ $result_trees{'no_category_or_no_name'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -479,9 +479,9 @@ 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 115b2b0c28..c67618c347 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -74,19 +74,19 @@ $result_trees{'not_closed'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -161,19 +161,19 @@ $result_trees{'not_closed'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -274,19 +274,19 @@ $result_trees{'not_closed'} = {
                           'name' => {}
                         },
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'defvar',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'defvar',
-                          'number' => 1
+                          'index_type_command' => 'defvar'
                         },
                         'original_def_cmdname' => 'defvar'
                       },
@@ -340,9 +340,9 @@ 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
@@ -353,9 +353,9 @@ 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -369,9 +369,9 @@ 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'conten
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'not_closed'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 4cd36aa2ac..59f1f89cb9 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -224,20 +224,20 @@ $result_trees{'omit_def_space'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defun'
                 },
                 'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defun'
@@ -335,20 +335,20 @@ $result_trees{'omit_def_space'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defunx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defun'
                 },
                 'omit_def_name_space' => 1,
                 'original_def_cmdname' => 'defunx',
@@ -474,10 +474,10 @@ 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'ar
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
@@ -491,10 +491,10 @@ 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'ar
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'omit_def_space'}{'contents'}[2];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index 6ce76de9a3..ee924073fd 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -59,19 +59,19 @@ $result_trees{'protected_brace'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -137,9 +137,9 @@ 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'a
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index e2afec2256..8bea5cdfbb 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -298,20 +298,20 @@ $result_trees{'ref_in_def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -549,20 +549,20 @@ $result_trees{'ref_in_def'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -713,10 +713,10 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -752,10 +752,10 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ref_in_def'}{'contents'}[1];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index f117dd891c..f6f62c8e97 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -155,20 +155,20 @@ $result_trees{'space_in_def_for_index'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -265,20 +265,20 @@ $result_trees{'space_in_def_for_index'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -413,10 +413,10 @@ 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
@@ -429,10 +429,10 @@ 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index f2d255f930..0244a4df87 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -104,19 +104,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -284,19 +284,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -462,19 +462,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -647,19 +647,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 4
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -812,19 +812,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 5,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 5
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -929,19 +929,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 6,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 6
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1062,19 +1062,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 7
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1193,19 +1193,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 8,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 8
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1331,19 +1331,19 @@ $result_trees{'wrong_braces_simple'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 9,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 9
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -1416,9 +1416,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -1440,9 +1440,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
@@ -1463,9 +1463,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
@@ -1487,9 +1487,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
@@ -1509,9 +1509,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
@@ -1526,9 +1526,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0];
@@ -1545,9 +1545,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0];
@@ -1563,9 +1563,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0];
@@ -1582,9 +1582,9 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl 
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index f5c5126d3f..801b519a98 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -94,19 +94,19 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -284,19 +284,19 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -391,9 +391,9 @@ 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -418,9 +418,9 @@ 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'c
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 712d629471..50792e70c8 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -155,16 +155,16 @@ $result_trees{'cindex_in_caption'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -341,10 +341,10 @@ 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[1];
+$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'cindex_in_caption'}{'contents'}[1];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index bfb4d26a48..2cf88ddf5d 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -375,16 +375,16 @@ $result_trees{'complex_float'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1577,16 +1577,16 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 2,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 2
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3089,16 +3089,16 @@ $result_trees{'complex_float'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 3,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 3
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -3823,10 +3823,10 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'par
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
@@ -3994,10 +3994,10 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_float'}{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_float'}{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
@@ -4216,10 +4216,10 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_float'}{'contents'}[3];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_float'}{'contents'}[3];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index 42beaa2ef1..27ed15c4eb 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -175,16 +175,16 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'cindex',
                                           'extra' => {
                                             'index_entry' => {
-                                              'command' => {},
-                                              'content' => [],
                                               'content_normalized' => [],
+                                              'entry_content' => [],
+                                              'entry_element' => {},
+                                              'entry_number' => 1,
+                                              'entry_region' => {},
                                               'in_code' => 0,
                                               'index_at_command' => 'cindex',
                                               'index_ignore_chars' => {},
                                               'index_name' => 'cp',
-                                              'index_type_command' => 'cindex',
-                                              'number' => 1,
-                                              'region' => {}
+                                              'index_type_command' => 'cindex'
                                             },
                                             'spaces_before_argument' => ' '
                                           },
@@ -216,16 +216,16 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'findex',
                                           'extra' => {
                                             'index_entry' => {
-                                              'command' => {},
-                                              'content' => [],
                                               'content_normalized' => [],
+                                              'entry_content' => [],
+                                              'entry_element' => {},
+                                              'entry_number' => 1,
+                                              'entry_region' => {},
                                               'in_code' => 1,
                                               'index_at_command' => 'findex',
                                               'index_ignore_chars' => {},
                                               'index_name' => 'fn',
-                                              'index_type_command' => 'findex',
-                                              'number' => 1,
-                                              'region' => {}
+                                              'index_type_command' => 'findex'
                                             },
                                             'spaces_before_argument' => ' '
                                           },
@@ -422,16 +422,16 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 2,
+                                  'entry_region' => {},
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'number' => 2,
-                                  'region' => {}
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -463,16 +463,16 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'findex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 2,
+                                  'entry_region' => {},
                                   'in_code' => 1,
                                   'index_at_command' => 'findex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
-                                  'index_type_command' => 'findex',
-                                  'number' => 2,
-                                  'region' => {}
+                                  'index_type_command' => 'findex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -1025,17 +1025,17 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5];
@@ -1064,17 +1064,17 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index b29dfcdc6a..55853ce94a 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -1146,16 +1146,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1187,16 +1187,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1228,16 +1228,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1269,16 +1269,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1310,16 +1310,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1351,16 +1351,16 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1565,45 +1565,45 @@ 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[1]{'pare
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[3]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[4]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[5]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[6]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[7]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8];
+$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[9]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12];
 $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'parent'} = 
$result_trees{'char_latin1_latin1_in_refs'};
diff --git a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
index dd5dfd7399..b80a73bb11 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
@@ -1146,16 +1146,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1187,16 +1187,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1228,16 +1228,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1269,16 +1269,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1310,16 +1310,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1351,16 +1351,16 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1565,45 +1565,45 @@ 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[1]{'parent
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[3]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[4]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[5]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[6]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[7]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8];
+$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[11];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[9]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12];
 $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'parent'} = 
$result_trees{'char_latin1_utf8_in_refs'};
diff --git a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index ac87766f21..d10e3a32db 100644
--- a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -486,16 +486,16 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -601,10 +601,10 @@ 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'args'}[0]{'parent'}
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1];
+$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4];
 $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'parent'} = 
$result_trees{'char_latin2_latin2_in_refs'};
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index 54b4c3742f..a5a501f311 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -861,16 +861,16 @@ $result_trees{'sample_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -915,16 +915,16 @@ $result_trees{'sample_utf8'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -956,16 +956,16 @@ $result_trees{'sample_utf8'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -997,16 +997,16 @@ $result_trees{'sample_utf8'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1526,33 +1526,33 @@ 
$result_trees{'sample_utf8'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
+$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'sample_utf8'}{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3];
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index a78b414a2c..ee431c50f3 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -234,16 +234,16 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'cindex',
                                           'extra' => {
                                             'index_entry' => {
-                                              'command' => {},
-                                              'content' => [],
                                               'content_normalized' => [],
+                                              'entry_content' => [],
+                                              'entry_element' => {},
+                                              'entry_number' => 1,
+                                              'entry_region' => {},
                                               'in_code' => 0,
                                               'index_at_command' => 'cindex',
                                               'index_ignore_chars' => {},
                                               'index_name' => 'cp',
-                                              'index_type_command' => 'cindex',
-                                              'number' => 1,
-                                              'region' => {}
+                                              'index_type_command' => 'cindex'
                                             },
                                             'spaces_before_argument' => ' '
                                           },
@@ -275,16 +275,16 @@ $result_trees{'float_copying'} = {
                                           'cmdname' => 'findex',
                                           'extra' => {
                                             'index_entry' => {
-                                              'command' => {},
-                                              'content' => [],
                                               'content_normalized' => [],
+                                              'entry_content' => [],
+                                              'entry_element' => {},
+                                              'entry_number' => 1,
+                                              'entry_region' => {},
                                               'in_code' => 1,
                                               'index_at_command' => 'findex',
                                               'index_ignore_chars' => {},
                                               'index_name' => 'fn',
-                                              'index_type_command' => 'findex',
-                                              'number' => 1,
-                                              'region' => {}
+                                              'index_type_command' => 'findex'
                                             },
                                             'spaces_before_argument' => ' '
                                           },
@@ -481,16 +481,16 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 2,
+                                  'entry_region' => {},
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'number' => 2,
-                                  'region' => {}
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -522,16 +522,16 @@ $result_trees{'float_copying'} = {
                               'cmdname' => 'findex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 2,
+                                  'entry_region' => {},
                                   'in_code' => 1,
                                   'index_at_command' => 'findex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
-                                  'index_type_command' => 'findex',
-                                  'number' => 2,
-                                  'region' => {}
+                                  'index_type_command' => 'findex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -752,16 +752,16 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1198,16 +1198,16 @@ $result_trees{'float_copying'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1486,17 +1486,17 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5];
@@ -1525,17 +1525,17 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'float'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
@@ -1565,10 +1565,10 @@ 
$result_trees{'float_copying'}{'contents'}[2]{'args'}[0]{'parent'} = $result_tre
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[1];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[1];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'float_copying'}{'contents'}[1];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[1];
+$result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'float_copying'}{'contents'}[1];
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[3];
@@ -1637,10 +1637,10 @@ 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[5]{'parent'} = $result
 $result_trees{'float_copying'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[4];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7];
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
+$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7];
+$result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'label'};
 $result_trees{'float_copying'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[4];
 $result_trees{'float_copying'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[4];
 
$result_trees{'float_copying'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[4]{'contents'}[9];
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 30bdd26a2b..ab5675fe45 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -105,16 +105,16 @@ $result_trees{'heading_in_copying'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 1,
+                  'entry_region' => {},
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 1,
-                  'region' => {}
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -316,10 +316,10 @@ 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0];
+$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index fd7c938ae2..fb24469d7d 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -109,20 +109,20 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'type' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
+                      'entry_region' => {},
                       'in_code' => 1,
                       'index_at_command' => 'deftypefun',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deftypefun',
-                      'number' => 1,
-                      'region' => {}
+                      'index_type_command' => 'deftypefun'
                     },
                     'original_def_cmdname' => 'deftypefun'
                   },
@@ -473,20 +473,20 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -589,10 +589,10 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -638,10 +638,10 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[1];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl 
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index b0ba8bd725..0a3f663bde 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -152,20 +152,20 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'type' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
+                      'entry_region' => {},
                       'in_code' => 1,
                       'index_at_command' => 'deftypefun',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deftypefun',
-                      'number' => 1,
-                      'region' => {}
+                      'index_type_command' => 'deftypefun'
                     },
                     'original_def_cmdname' => 'deftypefun'
                   },
@@ -433,20 +433,20 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   'type' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deftypefun',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deftypefun'
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -554,10 +554,10 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
@@ -593,10 +593,10 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'type'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[1];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/html_tests/index_and_node_same_name.pl 
b/tp/t/results/html_tests/index_and_node_same_name.pl
index e5471d32ad..67d69fb061 100644
--- a/tp/t/results/html_tests/index_and_node_same_name.pl
+++ b/tp/t/results/html_tests/index_and_node_same_name.pl
@@ -84,16 +84,16 @@ $result_trees{'index_and_node_same_name'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -178,10 +178,10 @@ 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'args'}[0]{'parent'} =
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
+$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1];
+$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_and_node_same_name'}{'contents'}[2]{'contents'}[2];
diff --git a/tp/t/results/html_tests/index_below.pl 
b/tp/t/results/html_tests/index_below.pl
index 7f84a631d7..5d3f8dc294 100644
--- a/tp/t/results/html_tests/index_below.pl
+++ b/tp/t/results/html_tests/index_below.pl
@@ -129,15 +129,15 @@ $result_trees{'index_below'} = [
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -236,9 +236,9 @@ 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'args'}[
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3];
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1];
-$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1];
-$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3];
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'index_below'}[0]{'contents'}[0]{'parent'}{'contents'}[3]{'contents'}[2];
diff --git a/tp/t/results/indices/complex_recursive_synindex.pl 
b/tp/t/results/indices/complex_recursive_synindex.pl
index 43fdb533c0..d1944dc8ba 100644
--- a/tp/t/results/indices/complex_recursive_synindex.pl
+++ b/tp/t/results/indices/complex_recursive_synindex.pl
@@ -347,16 +347,16 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'eeeindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'eeeindex',
               'index_ignore_chars' => {},
               'index_name' => 'eee',
-              'index_type_command' => 'eeeindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'eeeindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -460,16 +460,16 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'cccindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cccindex',
               'index_ignore_chars' => {},
               'index_name' => 'ccc',
-              'index_type_command' => 'cccindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cccindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -501,16 +501,16 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'bbbindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'bbbindex',
               'index_ignore_chars' => {},
               'index_name' => 'bbb',
-              'index_type_command' => 'bbbindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'bbbindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -542,16 +542,16 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'aaaindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'aaaindex',
               'index_ignore_chars' => {},
               'index_name' => 'aaa',
-              'index_type_command' => 'aaaindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'aaaindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -583,16 +583,16 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'dddindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'dddindex',
               'index_ignore_chars' => {},
               'index_name' => 'ddd',
-              'index_type_command' => 'dddindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'dddindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -624,16 +624,16 @@ $result_trees{'complex_recursive_synindex'} = {
           'cmdname' => 'eeeindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'eeeindex',
               'index_ignore_chars' => {},
               'index_name' => 'eee',
-              'index_type_command' => 'eeeindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'eeeindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -947,10 +947,10 @@ 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[11]{'args
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'args'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[14]{'args'}[0];
@@ -962,38 +962,38 @@ 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[15]{'pare
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[16]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'args'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[17]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'args'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[18]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'args'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[19]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'args'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[20]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'args'}[0];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21];
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21];
+$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[21]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[22]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1];
 
$result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[23]{'contents'}[0]{'parent'}
 = $result_trees{'complex_recursive_synindex'}{'contents'}[1]{'contents'}[23];
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index e273a11e6d..ae64819331 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -272,16 +272,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
               'index_name' => 'truc',
-              'index_type_command' => 'trucindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'trucindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -444,16 +444,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'codeidxindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_ignore_chars' => {},
               'index_name' => 'codeidx',
-              'index_type_command' => 'codeidxindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'codeidxindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -491,16 +491,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -576,16 +576,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
               'index_name' => 'ky',
-              'index_type_command' => 'kindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'kindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -617,16 +617,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'pindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_ignore_chars' => {},
               'index_name' => 'pg',
-              'index_type_command' => 'pindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'pindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -840,16 +840,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'defgindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'defgindex',
               'index_ignore_chars' => {},
               'index_name' => 'defg',
-              'index_type_command' => 'defgindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'defgindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -887,16 +887,16 @@ $result_trees{'def_syn_indices'} = {
           'cmdname' => 'abcindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'abcindex',
               'index_ignore_chars' => {},
               'index_name' => 'abc',
-              'index_type_command' => 'abcindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'abcindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1386,10 +1386,10 @@ 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[1]{'parent'} = $resu
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[5]{'args'}[0];
@@ -1411,18 +1411,18 @@ 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'conte
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[5];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[10]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[11]{'args'}[0];
@@ -1431,17 +1431,17 @@ 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[11]{'parent'} = $res
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[12]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[13]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[14]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[15]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[16]{'args'}[0];
@@ -1464,18 +1464,18 @@ 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[22]{'parent'} = $res
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[23]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[24]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[25]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'args'}[0];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26];
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26];
+$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_syn_indices'}{'contents'}[3];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[26]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[27]{'parent'} = 
$result_trees{'def_syn_indices'}{'contents'}[4];
 
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'parent'}
 = $result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[28];
diff --git 
a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 
b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
index c5aa83e002..e226220e03 100644
--- a/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
+++ b/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
@@ -101,16 +101,16 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -142,16 +142,16 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'} = {
           'cmdname' => 'cpindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'cpindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cpindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cpindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -238,17 +238,17 @@ 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'co
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3];
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4];
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4];
+$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1];
 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'default_cp_index_and_one_letter_syncodeindex'}{'contents'}[1]{'contents'}[6]{'args'}[0];
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 2311dbcbb5..0b14b5e0b3 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -63,16 +63,16 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -127,16 +127,16 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -353,16 +353,16 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -453,10 +453,10 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'parent'} = $resul
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3];
@@ -464,10 +464,10 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'} = $r
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7];
@@ -498,10 +498,10 @@ 
$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'parent'} = $resul
 $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
 $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
 $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index efbeb9e4ed..aebeadc1b5 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -232,15 +232,15 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -325,15 +325,15 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -418,15 +418,15 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'seeentry' => {},
@@ -476,15 +476,15 @@ $result_trees{'double_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' ',
@@ -634,10 +634,10 @@ 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -650,10 +650,10 @@ 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -666,10 +666,10 @@ 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'seeentry'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4];
@@ -677,10 +677,10 @@ 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4];
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4];
+$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'seealso'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0];
diff --git a/tp/t/results/indices/double_syncodeindex.pl 
b/tp/t/results/indices/double_syncodeindex.pl
index 8e3f294607..ac89ad28ae 100644
--- a/tp/t/results/indices/double_syncodeindex.pl
+++ b/tp/t/results/indices/double_syncodeindex.pl
@@ -134,16 +134,16 @@ $result_trees{'double_syncodeindex'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -175,16 +175,16 @@ $result_trees{'double_syncodeindex'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -305,17 +305,17 @@ 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'args'}[0]{'parent'} = $resu
 $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'double_syncodeindex'}{'contents'}[1];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1];
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1];
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1];
+$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1];
+$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1];
 $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'double_syncodeindex'}{'contents'}[1];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2];
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2];
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1];
+$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2];
+$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_syncodeindex'}{'contents'}[1];
 $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'double_syncodeindex'}{'contents'}[1];
 $result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'double_syncodeindex'}{'contents'}[1];
 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_syncodeindex'}{'contents'}[1]{'contents'}[4]{'args'}[0];
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 4322103efc..377d6868b6 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -114,16 +114,16 @@ $result_trees{'empty_string_index_entry'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -201,16 +201,16 @@ $result_trees{'empty_string_index_entry'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -394,20 +394,20 @@ $result_trees{'empty_string_index_entry'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -535,20 +535,20 @@ $result_trees{'empty_string_index_entry'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'defunx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defunx',
                 'spaces_before_argument' => ' '
@@ -678,10 +678,10 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[0]{'parent'
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -689,10 +689,10 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3];
@@ -716,10 +716,10 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'content
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
@@ -735,10 +735,10 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'content
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/indices/encoding_index_ascii.pl 
b/tp/t/results/indices/encoding_index_ascii.pl
index 976a011219..dd5d15e3f5 100644
--- a/tp/t/results/indices/encoding_index_ascii.pl
+++ b/tp/t/results/indices/encoding_index_ascii.pl
@@ -231,16 +231,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -356,16 +356,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -502,16 +502,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -543,16 +543,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -584,16 +584,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -625,16 +625,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -666,16 +666,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -707,16 +707,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -748,16 +748,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -789,16 +789,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -830,16 +830,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -871,16 +871,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -912,16 +912,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -953,16 +953,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -994,16 +994,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1035,16 +1035,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1076,16 +1076,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 17,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 17
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1117,16 +1117,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 18,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 18
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1158,16 +1158,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 19,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 19
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1199,16 +1199,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 20,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 20
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1240,16 +1240,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 21,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 21
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1281,16 +1281,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 22,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 22
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1322,16 +1322,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 23,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 23
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1363,16 +1363,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 24,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 24
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1404,16 +1404,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 25,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 25
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1445,16 +1445,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 26,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 26
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1486,16 +1486,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 27,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 27
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1527,16 +1527,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 28,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 28
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1568,16 +1568,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 29,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 29
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1609,16 +1609,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 30,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 30
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1650,16 +1650,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 31,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 31
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1702,16 +1702,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 32,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 32
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1754,16 +1754,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 33,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 33
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1841,16 +1841,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 34,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 34
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1962,16 +1962,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 35,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 35
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2014,16 +2014,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 36,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 36
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2066,16 +2066,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 37,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 37
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2118,16 +2118,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 38,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 38
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2170,16 +2170,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 39,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 39
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2222,16 +2222,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 40,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 40
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2274,16 +2274,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 41,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 41
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2326,16 +2326,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 42,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 42
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2367,16 +2367,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 43,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 43
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2408,16 +2408,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 44,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 44
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2460,16 +2460,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 45,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 45
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2512,16 +2512,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 46,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 46
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2564,16 +2564,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 47,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 47
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2605,16 +2605,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 48,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 48
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2646,16 +2646,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 49,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 49
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2687,16 +2687,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 50,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 50
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2728,16 +2728,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 51,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 51
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2769,16 +2769,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 52,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 52
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2810,16 +2810,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 53,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 53
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2851,16 +2851,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 54,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 54
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2892,16 +2892,16 @@ $result_trees{'encoding_index_ascii'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 55,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 55
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2992,10 +2992,10 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -3011,10 +3011,10 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -3033,222 +3033,222 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[6]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[7]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[8]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[9]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[10]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[11]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[12]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[13]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[14]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[15]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[16]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[17]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[18]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[19]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[20]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[21]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[22]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[23]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[24]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[25]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[26]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[27]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[28]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[29]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[30]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[31]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[32]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[33]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0];
@@ -3259,10 +3259,10 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[34]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3277,160 +3277,160 @@ 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[35]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[36]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[37]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[38]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[39]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[40]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[41]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[42]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[43]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[44]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[45]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[46]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[47]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[48]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[49]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[50]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[51]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[52]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[53]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[54]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'args'}[0];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55];
+$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii'}{'contents'}[1];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[55]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 $result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[56]{'parent'} 
= $result_trees{'encoding_index_ascii'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii'}{'contents'}[2]{'contents'}[57]{'args'}[0];
diff --git a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
index ecdc8ad7df..22469cb637 100644
--- a/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
@@ -231,16 +231,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -356,16 +356,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -502,16 +502,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -543,16 +543,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -584,16 +584,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -625,16 +625,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -666,16 +666,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -707,16 +707,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -748,16 +748,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -789,16 +789,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -830,16 +830,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -871,16 +871,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -912,16 +912,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -953,16 +953,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -994,16 +994,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1035,16 +1035,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1076,16 +1076,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 17,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 17
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1117,16 +1117,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 18,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 18
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1158,16 +1158,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 19,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 19
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1199,16 +1199,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 20,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 20
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1240,16 +1240,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 21,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 21
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1281,16 +1281,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 22,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 22
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1322,16 +1322,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 23,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 23
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1363,16 +1363,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 24,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 24
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1404,16 +1404,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 25,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 25
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1445,16 +1445,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 26,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 26
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1486,16 +1486,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 27,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 27
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1527,16 +1527,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 28,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 28
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1568,16 +1568,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 29,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 29
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1609,16 +1609,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 30,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 30
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1650,16 +1650,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 31,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 31
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1702,16 +1702,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 32,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 32
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1754,16 +1754,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 33,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 33
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1841,16 +1841,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 34,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 34
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1962,16 +1962,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 35,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 35
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2014,16 +2014,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 36,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 36
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2066,16 +2066,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 37,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 37
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2118,16 +2118,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 38,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 38
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2170,16 +2170,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 39,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 39
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2222,16 +2222,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 40,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 40
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2274,16 +2274,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 41,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 41
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2326,16 +2326,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 42,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 42
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2367,16 +2367,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 43,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 43
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2408,16 +2408,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 44,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 44
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2460,16 +2460,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 45,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 45
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2512,16 +2512,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 46,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 46
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2564,16 +2564,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 47,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 47
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2605,16 +2605,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 48,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 48
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2646,16 +2646,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 49,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 49
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2687,16 +2687,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 50,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 50
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2728,16 +2728,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 51,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 51
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2769,16 +2769,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 52,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 52
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2810,16 +2810,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 53,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 53
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2851,16 +2851,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 54,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 54
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2892,16 +2892,16 @@ $result_trees{'encoding_index_ascii_enable_encoding'} = 
{
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 55,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 55
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2992,10 +2992,10 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -3011,10 +3011,10 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -3033,222 +3033,222 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[14]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[16]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[17]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[18]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[19]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[22]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[23]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[24]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[26]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[27]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[28]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[29]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[30]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[32]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0];
@@ -3259,10 +3259,10 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[34]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3277,160 +3277,160 @@ 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[36]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[38]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[40]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[42]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[43]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[44]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[45]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[46]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[47]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[48]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[49]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[50]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[51]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[52]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[53]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[54]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55];
+$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[55]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[56]{'parent'}
 = $result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_ascii_enable_encoding'}{'contents'}[2]{'contents'}[57]{'args'}[0];
diff --git a/tp/t/results/indices/encoding_index_latin1.pl 
b/tp/t/results/indices/encoding_index_latin1.pl
index ef3bb8110a..e09b8be483 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -189,16 +189,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -314,16 +314,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -460,16 +460,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -501,16 +501,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -542,16 +542,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -583,16 +583,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -624,16 +624,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -665,16 +665,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -706,16 +706,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -747,16 +747,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -788,16 +788,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -829,16 +829,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -870,16 +870,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -911,16 +911,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -952,16 +952,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -993,16 +993,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1034,16 +1034,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 17,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 17
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1075,16 +1075,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 18,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 18
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1116,16 +1116,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 19,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 19
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1157,16 +1157,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 20,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 20
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1198,16 +1198,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 21,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 21
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1239,16 +1239,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 22,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 22
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1280,16 +1280,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 23,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 23
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1321,16 +1321,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 24,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 24
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1362,16 +1362,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 25,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 25
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1403,16 +1403,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 26,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 26
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1444,16 +1444,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 27,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 27
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1485,16 +1485,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 28,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 28
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1526,16 +1526,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 29,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 29
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1567,16 +1567,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 30,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 30
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1608,16 +1608,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 31,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 31
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1660,16 +1660,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 32,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 32
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1712,16 +1712,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 33,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 33
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1799,16 +1799,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 34,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 34
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1920,16 +1920,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 35,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 35
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1972,16 +1972,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 36,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 36
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2024,16 +2024,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 37,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 37
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2076,16 +2076,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 38,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 38
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2128,16 +2128,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 39,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 39
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2180,16 +2180,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 40,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 40
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2232,16 +2232,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 41,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 41
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2284,16 +2284,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 42,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 42
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2325,16 +2325,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 43,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 43
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2366,16 +2366,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 44,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 44
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2418,16 +2418,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 45,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 45
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2470,16 +2470,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 46,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 46
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2522,16 +2522,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 47,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 47
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2563,16 +2563,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 48,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 48
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2604,16 +2604,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 49,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 49
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2645,16 +2645,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 50,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 50
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2686,16 +2686,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 51,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 51
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2727,16 +2727,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 52,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 52
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2768,16 +2768,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 53,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 53
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2809,16 +2809,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 54,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 54
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2850,16 +2850,16 @@ $result_trees{'encoding_index_latin1'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 55,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 55
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2956,10 +2956,10 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'args'}[0]{'parent'} = $re
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[0]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2975,10 +2975,10 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2997,222 +2997,222 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[6]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[7]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[8]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[9]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[10]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[11]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[12]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[13]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[14]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[15]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[16]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[17]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[18]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[19]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[20]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[21]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[22]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[23]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[24]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[25]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[26]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[27]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[28]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[29]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[30]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[31]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[32]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[33]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0];
@@ -3223,10 +3223,10 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[34]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3241,160 +3241,160 @@ 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[35]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[36]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[37]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[38]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[39]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[40]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[41]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[42]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[43]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[44]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[45]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[46]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[47]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[48]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[49]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[50]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[51]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[52]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[53]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[54]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'args'}[0];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55];
+$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[56]{'parent'} 
= $result_trees{'encoding_index_latin1'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[57]{'args'}[0];
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index 2794686b08..3f71cee7e6 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -189,16 +189,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -314,16 +314,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -460,16 +460,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -501,16 +501,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -542,16 +542,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -583,16 +583,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -624,16 +624,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -665,16 +665,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -706,16 +706,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -747,16 +747,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -788,16 +788,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -829,16 +829,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -870,16 +870,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -911,16 +911,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -952,16 +952,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -993,16 +993,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1034,16 +1034,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 17,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 17
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1075,16 +1075,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 18,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 18
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1116,16 +1116,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 19,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 19
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1157,16 +1157,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 20,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 20
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1198,16 +1198,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 21,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 21
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1239,16 +1239,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 22,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 22
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1280,16 +1280,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 23,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 23
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1321,16 +1321,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 24,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 24
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1362,16 +1362,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 25,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 25
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1403,16 +1403,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 26,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 26
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1444,16 +1444,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 27,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 27
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1485,16 +1485,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 28,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 28
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1526,16 +1526,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 29,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 29
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1567,16 +1567,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 30,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 30
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1608,16 +1608,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 31,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 31
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1660,16 +1660,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 32,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 32
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1712,16 +1712,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 33,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 33
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1799,16 +1799,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 34,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 34
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1920,16 +1920,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 35,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 35
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1972,16 +1972,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 36,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 36
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2024,16 +2024,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 37,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 37
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2076,16 +2076,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 38,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 38
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2128,16 +2128,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 39,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 39
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2180,16 +2180,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 40,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 40
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2232,16 +2232,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 41,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 41
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2284,16 +2284,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 42,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 42
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2325,16 +2325,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 43,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 43
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2366,16 +2366,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 44,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 44
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2418,16 +2418,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 45,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 45
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2470,16 +2470,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 46,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 46
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2522,16 +2522,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 47,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 47
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2563,16 +2563,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 48,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 48
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2604,16 +2604,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 49,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 49
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2645,16 +2645,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 50,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 50
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2686,16 +2686,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 51,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 51
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2727,16 +2727,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 52,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 52
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2768,16 +2768,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 53,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 53
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2809,16 +2809,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 54,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 54
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2850,16 +2850,16 @@ $result_trees{'encoding_index_latin1_enable_encoding'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 55,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 55
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2956,10 +2956,10 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'args'}[0]
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2975,10 +2975,10 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2997,222 +2997,222 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[14]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[16]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[17]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[18]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[19]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[22]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[23]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[24]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[26]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[27]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[28]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[29]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[30]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[32]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0];
@@ -3223,10 +3223,10 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[34]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3241,160 +3241,160 @@ 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[36]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[38]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[40]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[42]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[43]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[44]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[45]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[46]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[47]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[48]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[49]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[50]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[51]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[52]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[53]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[54]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55];
+$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[56]{'parent'}
 = $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[57]{'args'}[0];
diff --git a/tp/t/results/indices/encoding_index_utf8.pl 
b/tp/t/results/indices/encoding_index_utf8.pl
index 5ad5282faa..66187819e1 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -189,16 +189,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -314,16 +314,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -460,16 +460,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -501,16 +501,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -542,16 +542,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -583,16 +583,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -624,16 +624,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -665,16 +665,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -706,16 +706,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -747,16 +747,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -788,16 +788,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -829,16 +829,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -870,16 +870,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -911,16 +911,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -952,16 +952,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -993,16 +993,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1034,16 +1034,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 17,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 17
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1075,16 +1075,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 18,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 18
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1116,16 +1116,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 19,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 19
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1157,16 +1157,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 20,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 20
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1198,16 +1198,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 21,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 21
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1239,16 +1239,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 22,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 22
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1280,16 +1280,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 23,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 23
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1321,16 +1321,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 24,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 24
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1362,16 +1362,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 25,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 25
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1403,16 +1403,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 26,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 26
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1444,16 +1444,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 27,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 27
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1485,16 +1485,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 28,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 28
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1526,16 +1526,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 29,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 29
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1567,16 +1567,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 30,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 30
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1608,16 +1608,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 31,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 31
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1660,16 +1660,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 32,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 32
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1712,16 +1712,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 33,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 33
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1799,16 +1799,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 34,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 34
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1920,16 +1920,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 35,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 35
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1972,16 +1972,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 36,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 36
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2024,16 +2024,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 37,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 37
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2076,16 +2076,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 38,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 38
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2128,16 +2128,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 39,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 39
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2180,16 +2180,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 40,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 40
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2232,16 +2232,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 41,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 41
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2284,16 +2284,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 42,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 42
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2325,16 +2325,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 43,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 43
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2366,16 +2366,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 44,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 44
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2418,16 +2418,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 45,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 45
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2470,16 +2470,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 46,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 46
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2522,16 +2522,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 47,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 47
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2563,16 +2563,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 48,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 48
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2604,16 +2604,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 49,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 49
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2645,16 +2645,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 50,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 50
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2686,16 +2686,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 51,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 51
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2727,16 +2727,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 52,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 52
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2768,16 +2768,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 53,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 53
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2809,16 +2809,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 54,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 54
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2850,16 +2850,16 @@ $result_trees{'encoding_index_utf8'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 55,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 55
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2956,10 +2956,10 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'args'}[0]{'parent'} = $resu
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2975,10 +2975,10 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'c
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2997,222 +2997,222 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'c
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[8]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[10]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[11]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[12]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[13]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[14]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[15]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[16]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[17]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[18]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[19]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[20]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[21]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[22]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[23]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[24]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[25]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[26]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[27]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[28]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[29]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[30]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[31]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[32]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[33]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0];
@@ -3223,10 +3223,10 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[34]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3241,160 +3241,160 @@ 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[35]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[36]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[37]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[38]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[39]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[40]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[41]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[42]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[43]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[44]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[45]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[46]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[47]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[48]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[49]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[50]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[51]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[52]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[53]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[54]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'args'}[0];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55];
+$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8'}{'contents'}[1];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 $result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[56]{'parent'} 
= $result_trees{'encoding_index_utf8'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[57]{'args'}[0];
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl 
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index ba560aac1d..94993ed4c0 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -189,16 +189,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -314,16 +314,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -460,16 +460,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -501,16 +501,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -542,16 +542,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -583,16 +583,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -624,16 +624,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -665,16 +665,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -706,16 +706,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -747,16 +747,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -788,16 +788,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -829,16 +829,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -870,16 +870,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -911,16 +911,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -952,16 +952,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -993,16 +993,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1034,16 +1034,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 17,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 17
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1075,16 +1075,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 18,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 18
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1116,16 +1116,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 19,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 19
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1157,16 +1157,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 20,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 20
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1198,16 +1198,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 21,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 21
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1239,16 +1239,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 22,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 22
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1280,16 +1280,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 23,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 23
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1321,16 +1321,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 24,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 24
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1362,16 +1362,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 25,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 25
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1403,16 +1403,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 26,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 26
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1444,16 +1444,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 27,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 27
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1485,16 +1485,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 28,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 28
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1526,16 +1526,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 29,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 29
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1567,16 +1567,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 30,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 30
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1608,16 +1608,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 31,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 31
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1660,16 +1660,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 32,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 32
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1712,16 +1712,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 33,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 33
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1799,16 +1799,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 34,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 34
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1920,16 +1920,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 35,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 35
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1972,16 +1972,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 36,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 36
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2024,16 +2024,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 37,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 37
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2076,16 +2076,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 38,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 38
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2128,16 +2128,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 39,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 39
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2180,16 +2180,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 40,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 40
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2232,16 +2232,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 41,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 41
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2284,16 +2284,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 42,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 42
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2325,16 +2325,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 43,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 43
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2366,16 +2366,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 44,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 44
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2418,16 +2418,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 45,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 45
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2470,16 +2470,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 46,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 46
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2522,16 +2522,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 47,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 47
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2563,16 +2563,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 48,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 48
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2604,16 +2604,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 49,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 49
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2645,16 +2645,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 50,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 50
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2686,16 +2686,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 51,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 51
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2727,16 +2727,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 52,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 52
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2768,16 +2768,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 53,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 53
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2809,16 +2809,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 54,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 54
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2850,16 +2850,16 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 55,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 55
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2956,10 +2956,10 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'args'}[0]{'
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -2975,10 +2975,10 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2997,222 +2997,222 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[14]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[16]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[17]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[18]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[19]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[22]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[23]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[24]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[26]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[27]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[28]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[29]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[30]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[32]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[33]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[0];
@@ -3223,10 +3223,10 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[34]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -3241,160 +3241,160 @@ 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[36]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[37]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[38]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[39]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[40]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[41]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[42]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[43]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[44]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[45]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[46]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[47]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[48]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[49]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[50]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[51]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[52]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[53]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[54]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55];
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
-$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'args'}[0]{'contents'};
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55];
+$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[56]{'parent'}
 = $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2];
 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[57]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[57]{'args'}[0];
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index eb19877b8f..7cc72ba49b 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -194,16 +194,16 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
               'index_type_command' => 'SKindex',
-              'node' => {},
-              'number' => 1,
               'sortas' => 'A'
             },
             'sortas' => 'A',
@@ -263,16 +263,16 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
               'index_type_command' => 'SKindex',
-              'node' => {},
-              'number' => 2,
               'sortas' => 'B'
             },
             'sortas' => 'B',
@@ -332,16 +332,16 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
               'index_type_command' => 'SKindex',
-              'node' => {},
-              'number' => 3,
               'sortas' => '0'
             },
             'sortas' => '0',
@@ -413,16 +413,16 @@ $result_trees{'explicit_sort_key'} = {
           'cmdname' => 'SKindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'SKindex',
               'index_ignore_chars' => {},
               'index_name' => 'SK',
-              'index_type_command' => 'SKindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'SKindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -715,10 +715,10 @@ 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'con
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[3]{'parent'} = 
$result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -726,10 +726,10 @@ 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'con
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[4]{'parent'} = 
$result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -737,10 +737,10 @@ 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'con
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[5]{'parent'} = 
$result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
@@ -749,10 +749,10 @@ 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'con
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6];
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6];
+$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3];
 $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'explicit_sort_key'}{'contents'}[3];
 $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'explicit_sort_key'}{'contents'}[3];
 
$result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'explicit_sort_key'}{'contents'}[3]{'contents'}[8];
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index ebc0dd97d1..59eb86c5df 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -104,16 +104,16 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -144,16 +144,16 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -213,16 +213,16 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 3
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -352,16 +352,16 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -392,16 +392,16 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -461,16 +461,16 @@ $result_trees{'ftable_vtable'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 3
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -556,16 +556,16 @@ $result_trees{'ftable_vtable'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -695,17 +695,17 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'content
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -714,10 +714,10 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'con
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1];
@@ -733,17 +733,17 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'con
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -752,10 +752,10 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'con
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3];
@@ -767,10 +767,10 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'parent'} = $result
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5];
+$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'ftable_vtable'}{'contents'}[1];
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[7]{'args'}[0];
diff --git a/tp/t/results/indices/image_lines_count.pl 
b/tp/t/results/indices/image_lines_count.pl
index d48823239b..f1ead55593 100644
--- a/tp/t/results/indices/image_lines_count.pl
+++ b/tp/t/results/indices/image_lines_count.pl
@@ -98,16 +98,16 @@ $result_trees{'image_lines_count'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -195,10 +195,10 @@ 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[2]{'parent'} = $re
 $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'image_lines_count'}{'contents'}[1];
 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4];
-$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4];
-$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'image_lines_count'}{'contents'}[1];
+$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4];
+$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'image_lines_count'}{'contents'}[1];
 $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'image_lines_count'}{'contents'}[1];
 $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'image_lines_count'}{'contents'}[1];
 
$result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'image_lines_count'}{'contents'}[1]{'contents'}[6]{'args'}[0];
diff --git a/tp/t/results/indices/image_text_lines_count.pl 
b/tp/t/results/indices/image_text_lines_count.pl
index 6221d6b04c..e1f41d1e79 100644
--- a/tp/t/results/indices/image_text_lines_count.pl
+++ b/tp/t/results/indices/image_text_lines_count.pl
@@ -98,16 +98,16 @@ $result_trees{'image_text_lines_count'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -195,10 +195,10 @@ 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[2]{'parent'}
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'image_text_lines_count'}{'contents'}[1];
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4];
-$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4];
-$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'image_text_lines_count'}{'contents'}[1];
+$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4];
+$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'image_text_lines_count'}{'contents'}[1];
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'image_text_lines_count'}{'contents'}[1];
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[5]{'parent'} 
= $result_trees{'image_text_lines_count'}{'contents'}[1];
 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_text_lines_count'}{'contents'}[1]{'contents'}[6]{'args'}[0];
diff --git a/tp/t/results/indices/index_entries_locations.pl 
b/tp/t/results/indices/index_entries_locations.pl
index 85d7a33b20..c44b797754 100644
--- a/tp/t/results/indices/index_entries_locations.pl
+++ b/tp/t/results/indices/index_entries_locations.pl
@@ -99,16 +99,16 @@ $result_trees{'index_entries_locations'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -145,16 +145,16 @@ $result_trees{'index_entries_locations'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -213,16 +213,16 @@ $result_trees{'index_entries_locations'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -271,16 +271,16 @@ $result_trees{'index_entries_locations'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -386,18 +386,18 @@ 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[2]{'parent'}
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
@@ -406,20 +406,20 @@ 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[5]{'parent'}
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[9]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10];
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10];
+$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[10]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1];
 
$result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'index_entries_locations'}{'contents'}[1]{'contents'}[12];
diff --git a/tp/t/results/indices/index_entry_before_first_node.pl 
b/tp/t/results/indices/index_entry_before_first_node.pl
index 9f0f802850..df802fb131 100644
--- a/tp/t/results/indices/index_entry_before_first_node.pl
+++ b/tp/t/results/indices/index_entry_before_first_node.pl
@@ -46,15 +46,15 @@ $result_trees{'index_entry_before_first_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -164,9 +164,9 @@ 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[0]{'pa
 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'index_entry_before_first_node'}{'contents'}[0];
 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_before_first_node'}{'contents'}[0];
 
$result_trees{'index_entry_before_first_node'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'index_entry_before_first_node'}{'contents'}[0];
 $result_trees{'index_entry_before_first_node'}{'contents'}[0]{'parent'} = 
$result_trees{'index_entry_before_first_node'};
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 50f52f5561..108a6bf283 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -322,16 +322,16 @@ $result_trees{'index_entry_before_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -552,10 +552,10 @@ 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[1]{'parent'}
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3];
+$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/indices/index_entry_in_footnote.pl 
b/tp/t/results/indices/index_entry_in_footnote.pl
index c8d4d7b7ad..19f2495461 100644
--- a/tp/t/results/indices/index_entry_in_footnote.pl
+++ b/tp/t/results/indices/index_entry_in_footnote.pl
@@ -80,16 +80,16 @@ $result_trees{'index_entry_in_footnote'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -200,10 +200,10 @@ 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_footnote'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl 
b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
index 47fc3ec8b1..b2fbf4ad55 100644
--- a/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
@@ -193,16 +193,16 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -278,16 +278,16 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
-                          'index_type_command' => 'cindex',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'cindex'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -458,10 +458,10 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'cont
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
@@ -473,10 +473,10 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'cont
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6];
+$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3];
diff --git a/tp/t/results/indices/index_entry_in_footnote_separate.pl 
b/tp/t/results/indices/index_entry_in_footnote_separate.pl
index 0301627463..da12b62427 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -225,16 +225,16 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -310,16 +310,16 @@ $result_trees{'index_entry_in_footnote_separate'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
-                          'index_type_command' => 'cindex',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'cindex'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -493,10 +493,10 @@ 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
@@ -508,10 +508,10 @@ 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6];
+$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3];
diff --git 
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index cb942ce182..99da2f98eb 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -266,15 +266,15 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1,
               'sortas' => 'A---S'
             },
             'seealso' => {},
@@ -344,16 +344,16 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1,
               'sortas' => 'BB'
             },
             'sortas' => 'BB',
@@ -421,15 +421,15 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -529,10 +529,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'con
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'seealso'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[10];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'extra'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4];
@@ -544,10 +544,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'con
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -557,10 +557,10 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'con
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3];
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3];
+$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[3];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'extra'}{'seeentry'}
 = 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4];
 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'multiple_index_text_sortas_seeentry_seealso'}{'contents'}[4];
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 9a5893817c..42209bafac 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -50,16 +50,16 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   'cmdname' => 'findex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
+                      'entry_region' => {},
                       'in_code' => 1,
                       'index_at_command' => 'findex',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'findex',
-                      'number' => 1,
-                      'region' => {}
+                      'index_type_command' => 'findex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -148,20 +148,20 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'name' => {}
                         },
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 2,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defun',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'defun',
-                          'number' => 2,
-                          'region' => {}
+                          'index_type_command' => 'defun'
                         },
                         'original_def_cmdname' => 'defun'
                       },
@@ -242,20 +242,20 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                           'name' => {}
                         },
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 3,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defunx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'defun',
-                          'number' => 3,
-                          'region' => {}
+                          'index_type_command' => 'defun'
                         },
                         'original_def_cmdname' => 'defunx',
                         'spaces_before_argument' => ' '
@@ -380,16 +380,16 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 4,
+                                  'entry_region' => {},
                                   'in_code' => 1,
                                   'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
-                                  'index_type_command' => 'ftable',
-                                  'number' => 4,
-                                  'region' => {}
+                                  'index_type_command' => 'ftable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -420,16 +420,16 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'cmdname' => 'itemx',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 5,
+                                  'entry_region' => {},
                                   'in_code' => 1,
                                   'index_at_command' => 'itemx',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
-                                  'index_type_command' => 'ftable',
-                                  'number' => 5,
-                                  'region' => {}
+                                  'index_type_command' => 'ftable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -950,10 +950,10 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -966,10 +966,10 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
@@ -981,10 +981,10 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
@@ -998,17 +998,17 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
index c37f05b62f..8307843ae6 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
@@ -67,16 +67,16 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                                   'cmdname' => 'cindex',
                                   'extra' => {
                                     'index_entry' => {
-                                      'command' => {},
-                                      'content' => [],
                                       'content_normalized' => [],
+                                      'entry_content' => [],
+                                      'entry_element' => {},
+                                      'entry_number' => 1,
+                                      'entry_region' => {},
                                       'in_code' => 0,
                                       'index_at_command' => 'cindex',
                                       'index_ignore_chars' => {},
                                       'index_name' => 'cp',
-                                      'index_type_command' => 'cindex',
-                                      'number' => 1,
-                                      'region' => {}
+                                      'index_type_command' => 'cindex'
                                     },
                                     'spaces_before_argument' => ' '
                                   },
@@ -549,10 +549,10 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'c
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
diff --git 
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl 
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index 868f4adbe1..684fe8ada9 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -50,16 +50,16 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   'cmdname' => 'findex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
+                      'entry_region' => {},
                       'in_code' => 1,
                       'index_at_command' => 'findex',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'findex',
-                      'number' => 1,
-                      'region' => {}
+                      'index_type_command' => 'findex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -148,20 +148,20 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'name' => {}
                         },
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 2,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defun',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'defun',
-                          'number' => 2,
-                          'region' => {}
+                          'index_type_command' => 'defun'
                         },
                         'original_def_cmdname' => 'defun'
                       },
@@ -242,20 +242,20 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                           'name' => {}
                         },
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 3,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defunx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'defun',
-                          'number' => 3,
-                          'region' => {}
+                          'index_type_command' => 'defun'
                         },
                         'original_def_cmdname' => 'defunx',
                         'spaces_before_argument' => ' '
@@ -380,16 +380,16 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 4,
+                                  'entry_region' => {},
                                   'in_code' => 1,
                                   'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
-                                  'index_type_command' => 'ftable',
-                                  'number' => 4,
-                                  'region' => {}
+                                  'index_type_command' => 'ftable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -420,16 +420,16 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'cmdname' => 'itemx',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 5,
+                                  'entry_region' => {},
                                   'in_code' => 1,
                                   'index_at_command' => 'itemx',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'fn',
-                                  'index_type_command' => 'ftable',
-                                  'number' => 5,
-                                  'region' => {}
+                                  'index_type_command' => 'ftable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -916,10 +916,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -932,10 +932,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
@@ -947,10 +947,10 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
@@ -964,17 +964,17 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/indices/printindex_with_space_before.pl 
b/tp/t/results/indices/printindex_with_space_before.pl
index d18b6a8b4a..861ce3ae97 100644
--- a/tp/t/results/indices/printindex_with_space_before.pl
+++ b/tp/t/results/indices/printindex_with_space_before.pl
@@ -63,16 +63,16 @@ $result_trees{'printindex_with_space_before'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -166,10 +166,10 @@ 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'args'}[0]{'parent'
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1];
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1];
-$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1];
-$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1];
+$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1];
+$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1];
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1];
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1];
 
$result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'printindex_with_space_before'}{'contents'}[1]{'contents'}[3];
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl 
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index dda2fb6ab5..6c296c905d 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -216,20 +216,20 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -360,20 +360,20 @@ $result_trees{'same_index_entry_merged_indices'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvar',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defvar'
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -518,10 +518,10 @@ 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[1];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[1];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
@@ -539,10 +539,10 @@ 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[1];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
+$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[1];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index ba249be868..9313596d3b 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -206,15 +206,15 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -273,15 +273,15 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -346,15 +346,15 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -413,15 +413,15 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -486,15 +486,15 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -553,15 +553,15 @@ $result_trees{'same_only_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -650,10 +650,10 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0];
@@ -662,10 +662,10 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
@@ -675,10 +675,10 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0];
@@ -687,10 +687,10 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
@@ -700,10 +700,10 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'seealso'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0];
@@ -712,10 +712,10 @@ 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8];
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8];
+$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'seeentry'}
 = 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_only_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'parent'}
 = $result_trees{'same_only_seealso_seeentry'}{'contents'}[4];
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index a83f8379e2..6d391cb786 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -206,15 +206,15 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -273,15 +273,15 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -346,15 +346,15 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -413,15 +413,15 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -486,15 +486,15 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -553,15 +553,15 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -600,16 +600,16 @@ $result_trees{'same_seealso_seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -697,10 +697,10 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0];
@@ -709,10 +709,10 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[3]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
@@ -722,10 +722,10 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[4]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0];
@@ -734,10 +734,10 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[5]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[6]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
@@ -747,10 +747,10 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'extra'}{'seealso'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[2];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[7]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0];
@@ -759,19 +759,19 @@ 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'extra'}{'seeentry'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[2];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[8]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[9]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'args'}[0];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10];
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10];
+$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'same_seealso_seeentry'}{'contents'}[3];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[10]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[11]{'parent'} 
= $result_trees{'same_seealso_seeentry'}{'contents'}[4];
 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_seealso_seeentry'}{'contents'}[4]{'contents'}[12]{'args'}[0];
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 54229d6a02..e42d196e92 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -79,16 +79,16 @@ $result_trees{'seealso_duplicate'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -166,16 +166,16 @@ $result_trees{'seealso_duplicate'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -338,10 +338,10 @@ 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'con
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1];
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1];
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1];
+$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1];
+$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'subentry'};
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[1]{'extra'}{'subentry'}{'parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1];
@@ -351,10 +351,10 @@ 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'con
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3];
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3];
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1];
+$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3];
+$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'seealso_duplicate'}{'contents'}[1];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'seealso_duplicate'}{'contents'}[1]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[2]{'args'}[0];
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 4104969e3c..d00e59eb47 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -198,15 +198,15 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -265,15 +265,15 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -338,15 +338,15 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'seeentry' => {},
             'spaces_before_argument' => ' '
@@ -405,15 +405,15 @@ $result_trees{'seeentry'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'seealso' => {},
             'spaces_before_argument' => ' '
@@ -532,10 +532,10 @@ 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'extra'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -544,10 +544,10 @@ 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'extra'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4];
@@ -557,10 +557,10 @@ 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[4];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[4];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'extra'}{'seeentry'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -569,10 +569,10 @@ 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5];
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'seeentry'}{'contents'}[3];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5];
+$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'seeentry'}{'contents'}[3];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'extra'}{'seealso'} = 
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4];
 $result_trees{'seeentry'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'seeentry'}{'contents'}[4];
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index 0253fcfebf..973e94e576 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -172,16 +172,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -212,16 +212,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -282,16 +282,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -381,16 +381,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -516,16 +516,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -556,16 +556,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -626,16 +626,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -725,16 +725,16 @@ $result_trees{'subentries'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -936,17 +936,17 @@ 
$result_trees{'subentries'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'subentries'}{'contents'}[4];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[1];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'subentries'}{'contents'}[4];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[2];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[2];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[2];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'}{'parent'}
 = $result_trees{'subentries'}{'contents'}[4];
@@ -954,10 +954,10 @@ 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'parent'} = $result_tr
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[3] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[2]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[4];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[4];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[4];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
@@ -969,10 +969,10 @@ $result_trees{'subentries'}{'contents'}[4]{'contents'}[5] 
= $result_trees{'suben
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[6] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[7];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[7];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[7];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[7]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
@@ -989,17 +989,17 @@ 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[10] = $result_trees{'sube
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[11]{'parent'} = 
$result_trees{'subentries'}{'contents'}[4];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[12];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[12];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[12];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[12]{'parent'} = 
$result_trees{'subentries'}{'contents'}[4];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[13];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[13];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[13];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'}{'parent'}
 = $result_trees{'subentries'}{'contents'}[4];
@@ -1007,10 +1007,10 @@ 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'parent'} = $result_t
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[14] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[13]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[15];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[15];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[15];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
@@ -1022,10 +1022,10 @@ 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[16] = $result_trees{'sube
 $result_trees{'subentries'}{'contents'}[4]{'contents'}[17] = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[15]{'extra'}{'subentry'}{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'args'}[0]{'parent'} 
= $result_trees{'subentries'}{'contents'}[4]{'contents'}[18];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[18];
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentries'}{'contents'}[3];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentries'}{'contents'}[4]{'contents'}[18];
+$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentries'}{'contents'}[3];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'args'}[0];
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'args'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'};
 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentries'}{'contents'}[4]{'contents'}[18]{'extra'}{'subentry'}{'extra'}{'subentry'}{'args'}[0];
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index a8e5a2ed2e..60c4a53752 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -197,16 +197,16 @@ $result_trees{'subentry_and_sortas'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
               'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1,
               'sortas' => 'A---S'
             },
             'sortas' => 'A---S',
@@ -328,16 +328,16 @@ $result_trees{'subentry_and_sortas'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
               'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1,
               'sortas' => 'X---S'
             },
             'sortas' => 'X---S',
@@ -514,10 +514,10 @@ 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'c
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0];
@@ -534,10 +534,10 @@ 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'c
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4];
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4];
+$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'subentry_and_sortas'}{'contents'}[3];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0];
 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[4]{'extra'}{'subentry'}{'args'}[0];
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 6a7498ba61..3a4f6e301d 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -219,16 +219,16 @@ $result_trees{'syncode_index_print_both'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -260,16 +260,16 @@ $result_trees{'syncode_index_print_both'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -440,17 +440,17 @@ 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'args'}[0]{'parent'} =
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1];
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1];
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2];
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2];
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2];
+$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[3];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4];
 
$result_trees{'syncode_index_print_both'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'syncode_index_print_both'}{'contents'}[4];
diff --git a/tp/t/results/indices/syncodeindex_to_plain.pl 
b/tp/t/results/indices/syncodeindex_to_plain.pl
index 7ae749cb27..87b5bd00a9 100644
--- a/tp/t/results/indices/syncodeindex_to_plain.pl
+++ b/tp/t/results/indices/syncodeindex_to_plain.pl
@@ -102,16 +102,16 @@ $result_trees{'syncodeindex_to_plain'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
               'index_name' => 'ky',
-              'index_type_command' => 'kindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'kindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -143,16 +143,16 @@ $result_trees{'syncodeindex_to_plain'} = {
           'cmdname' => 'vindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'vindex',
               'index_ignore_chars' => {},
               'index_name' => 'vr',
-              'index_type_command' => 'vindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'vindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -184,16 +184,16 @@ $result_trees{'syncodeindex_to_plain'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -339,24 +339,24 @@ 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'args'}[0]{'parent'} = $re
 $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3];
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3];
+$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'syncodeindex_to_plain'}{'contents'}[1];
 
$result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'syncodeindex_to_plain'}{'contents'}[1]{'contents'}[5];
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index 91b406eeb1..345b70cb29 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -204,18 +204,18 @@ $result_trees{'transparent_sort_chars'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '-' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -247,18 +247,18 @@ $result_trees{'transparent_sort_chars'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '-' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -290,18 +290,18 @@ $result_trees{'transparent_sort_chars'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '-' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -402,24 +402,24 @@ 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[1]{'parent'} 
= $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[2]{'parent'} 
= $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3];
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3];
+$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[3]{'parent'} 
= $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[4]{'parent'} 
= $result_trees{'transparent_sort_chars'}{'contents'}[3];
 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transparent_sort_chars'}{'contents'}[3]{'contents'}[5]{'args'}[0];
diff --git a/tp/t/results/indices/unknown_then_known_index_entry.pl 
b/tp/t/results/indices/unknown_then_known_index_entry.pl
index 64b75748e8..7ae2cecf34 100644
--- a/tp/t/results/indices/unknown_then_known_index_entry.pl
+++ b/tp/t/results/indices/unknown_then_known_index_entry.pl
@@ -67,15 +67,15 @@ $result_trees{'unknown_then_known_index_entry'} = {
               'cmdname' => 'someindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'someindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'some',
-                  'index_type_command' => 'someindex',
-                  'number' => 1
+                  'index_type_command' => 'someindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -104,9 +104,9 @@ 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_then_known_index_entry'}{'contents'}[0];
 $result_trees{'unknown_then_known_index_entry'}{'contents'}[0]{'parent'} = 
$result_trees{'unknown_then_known_index_entry'};
diff --git a/tp/t/results/indices/w_lines_count.pl 
b/tp/t/results/indices/w_lines_count.pl
index 328143ca85..d4af1ff2f2 100644
--- a/tp/t/results/indices/w_lines_count.pl
+++ b/tp/t/results/indices/w_lines_count.pl
@@ -158,16 +158,16 @@ $result_trees{'w_lines_count'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -305,10 +305,10 @@ 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[1]{'parent'} = $result
 $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'w_lines_count'}{'contents'}[2];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3];
-$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3];
-$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'w_lines_count'}{'contents'}[1];
+$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3];
+$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'w_lines_count'}{'contents'}[1];
 $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'w_lines_count'}{'contents'}[2];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'w_lines_count'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/info_tests/before_node_and_section.pl 
b/tp/t/results/info_tests/before_node_and_section.pl
index b88f8fbb52..11bbca8cdd 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -114,15 +114,15 @@ $result_trees{'before_node_and_section'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 1
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -717,9 +717,9 @@ 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index d1dc8ad96d..2921a8db0d 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -94,16 +94,16 @@ $result_trees{'colon_in_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -170,16 +170,16 @@ $result_trees{'colon_in_index_entry'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 0,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -347,20 +347,20 @@ $result_trees{'colon_in_index_entry'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'defvr',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -487,20 +487,20 @@ $result_trees{'colon_in_index_entry'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'defvrx',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defvr',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defvr'
                 },
                 'original_def_cmdname' => 'defvrx',
                 'spaces_before_argument' => ' '
@@ -627,20 +627,20 @@ 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'} =
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5];
@@ -663,10 +663,10 @@ 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
@@ -683,10 +683,10 @@ 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
diff --git a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
index a1e113b796..052b8d2670 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node.pl
@@ -366,16 +366,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -407,16 +407,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -448,16 +448,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -562,16 +562,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -603,16 +603,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -644,16 +644,16 @@ $result_trees{'colons_in_index_entries_and_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -864,24 +864,24 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'args'}[0]{'par
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5];
@@ -894,24 +894,24 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9];
+$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[11];
diff --git 
a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl 
b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
index a6194a7cf0..afcb0be37a 100644
--- a/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
+++ b/tp/t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl
@@ -366,16 +366,16 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -407,16 +407,16 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -448,16 +448,16 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -562,16 +562,16 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -603,16 +603,16 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -644,16 +644,16 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -864,24 +864,24 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'arg
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5];
@@ -894,24 +894,24 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'con
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9];
+$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[11];
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index cbd0112513..5040e6b15f 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -249,20 +249,20 @@ $result_trees{'def_in_copying'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
+                      'entry_region' => {},
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 1,
-                      'region' => {}
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffn'
                   },
@@ -337,20 +337,20 @@ $result_trees{'def_in_copying'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 2,
+                      'entry_region' => {},
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'deffn',
-                      'number' => 2,
-                      'region' => {}
+                      'index_type_command' => 'deffn'
                     },
                     'original_def_cmdname' => 'deffnx',
                     'spaces_before_argument' => ' '
@@ -539,20 +539,20 @@ $result_trees{'def_in_copying'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -627,20 +627,20 @@ $result_trees{'def_in_copying'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -792,10 +792,10 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'co
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
@@ -806,10 +806,10 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'co
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2];
@@ -834,10 +834,10 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'ar
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0];
@@ -848,10 +848,10 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'ar
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
+$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'def_in_copying'}{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[2];
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index 3b26567063..15011fac18 100644
--- a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -287,16 +287,16 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1060,10 +1060,10 @@ 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6];
+$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[3];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[4]{'contents'}[8]{'args'}[0];
diff --git a/tp/t/results/info_tests/index_entry_at_end_node.pl 
b/tp/t/results/info_tests/index_entry_at_end_node.pl
index 898c000bc3..2e6920b43c 100644
--- a/tp/t/results/info_tests/index_entry_at_end_node.pl
+++ b/tp/t/results/info_tests/index_entry_at_end_node.pl
@@ -360,16 +360,16 @@ $result_trees{'index_entry_at_end_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -558,10 +558,10 @@ 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[1]{'parent'}
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3];
-$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3];
-$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[3];
+$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3];
+$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[3];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[4];
 $result_trees{'index_entry_at_end_node'}{'contents'}[4]{'parent'} = 
$result_trees{'index_entry_at_end_node'};
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 039b47e689..b5459bc295 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -307,16 +307,16 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_node' => {},
+                                  'entry_number' => 1,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'node' => {},
-                                  'number' => 1
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -648,16 +648,16 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_node' => {},
+                                  'entry_number' => 2,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'node' => {},
-                                  'number' => 2
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -1061,10 +1061,10 @@ 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
@@ -1110,10 +1110,10 @@ 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index 8c2ba6fc5d..d6222e3ef7 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -227,16 +227,16 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               'cmdname' => 'cindex',
                                               'extra' => {
                                                 'index_entry' => {
-                                                  'command' => {},
-                                                  'content' => [],
                                                   'content_normalized' => [],
+                                                  'entry_content' => [],
+                                                  'entry_element' => {},
+                                                  'entry_node' => {},
+                                                  'entry_number' => 1,
                                                   'in_code' => 0,
                                                   'index_at_command' => 
'cindex',
                                                   'index_ignore_chars' => {},
                                                   'index_name' => 'cp',
-                                                  'index_type_command' => 
'cindex',
-                                                  'node' => {},
-                                                  'number' => 1
+                                                  'index_type_command' => 
'cindex'
                                                 },
                                                 'spaces_before_argument' => ' '
                                               },
@@ -480,16 +480,16 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_node' => {},
+                                  'entry_number' => 2,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'node' => {},
-                                  'number' => 2
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -758,10 +758,10 @@ 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
@@ -793,10 +793,10 @@ 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 64c04e443a..cfab7edfec 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -158,15 +158,10 @@ $result_trees{'test_index'} = {
                         'cmdname' => 'cindex',
                         'extra' => {
                           'index_entry' => {
-                            'command' => {},
-                            'content' => [],
                             'content_normalized' => [],
-                            'in_code' => 0,
-                            'index_at_command' => 'cindex',
-                            'index_ignore_chars' => {},
-                            'index_name' => 'cp',
-                            'index_type_command' => 'cindex',
-                            'node' => {
+                            'entry_content' => [],
+                            'entry_element' => {},
+                            'entry_node' => {
                               'args' => [
                                 {
                                   'contents' => [
@@ -207,7 +202,12 @@ $result_trees{'test_index'} = {
                                 'macro' => ''
                               }
                             },
-                            'number' => 7
+                            'entry_number' => 7,
+                            'in_code' => 0,
+                            'index_at_command' => 'cindex',
+                            'index_ignore_chars' => {},
+                            'index_name' => 'cp',
+                            'index_type_command' => 'cindex'
                           },
                           'spaces_before_argument' => ' '
                         },
@@ -311,16 +311,16 @@ $result_trees{'test_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -352,16 +352,16 @@ $result_trees{'test_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -404,16 +404,16 @@ $result_trees{'test_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -445,16 +445,16 @@ $result_trees{'test_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -573,20 +573,20 @@ $result_trees{'test_index'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -676,20 +676,20 @@ $result_trees{'test_index'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -809,16 +809,16 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 3
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -884,16 +884,16 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 4,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 4
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -924,16 +924,16 @@ $result_trees{'test_index'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 5,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 5
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -1277,16 +1277,16 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1318,16 +1318,16 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1372,16 +1372,16 @@ $result_trees{'test_index'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1513,16 +1513,16 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2835,16 +2835,16 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2919,16 +2919,16 @@ $result_trees{'test_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -3025,16 +3025,16 @@ $result_trees{'test_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -3324,14 +3324,14 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'args'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'}{'parent'}
 = $result_trees{'test_index'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'args'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'args'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'args'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}{'parent'}
 = $result_trees{'test_index'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[2]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[3]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
@@ -3346,32 +3346,32 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[2]{'parent'} = $result_tr
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[3];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
@@ -3388,10 +3388,10 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
@@ -3404,10 +3404,10 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5];
@@ -3420,10 +3420,10 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -3433,17 +3433,17 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'conten
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[1];
@@ -3492,26 +3492,26 @@ 
$result_trees{'test_index'}{'contents'}[4]{'args'}[0]{'parent'} = $result_trees{
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[4]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[4]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[2];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[2];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[4];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
@@ -3533,10 +3533,10 @@ 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[14]{'parent'} = $result_t
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[15]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[4]{'contents'}[16];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[16];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[16];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[16]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[17]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[18];
@@ -3766,23 +3766,23 @@ 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[166]{'parent'} = $result_
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[167]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[168];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[168];
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'test_index'}{'contents'}[3];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[4]{'contents'}[168];
+$result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'test_index'}{'contents'}[3];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[168]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 $result_trees{'test_index'}{'contents'}[4]{'contents'}[169]{'parent'} = 
$result_trees{'test_index'}{'contents'}[4];
 $result_trees{'test_index'}{'contents'}[4]{'parent'} = 
$result_trees{'test_index'};
-$result_trees{'test_index'}{'contents'}[5] = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'};
+$result_trees{'test_index'}{'contents'}[5] = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'};
 $result_trees{'test_index'}{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[6]{'args'}[0];
 $result_trees{'test_index'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'args'}[0];
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[6]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'};
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'};
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
@@ -3795,10 +3795,10 @@ 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[5]{'parent'} = $result_tr
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[6]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'args'}[0];
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[6]{'contents'}[7];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[7];
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'node'};
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[7];
+$result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'}{'parent'}{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'};
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[7]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
 $result_trees{'test_index'}{'contents'}[6]{'contents'}[8]{'parent'} = 
$result_trees{'test_index'}{'contents'}[6];
 
$result_trees{'test_index'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[6]{'contents'}[9];
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index ec9cb236dd..9885648283 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -123,19 +123,19 @@ $result_trees{'block_not_matching'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -570,9 +570,9 @@ 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 8a2dd6bc98..3852b45cfb 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -160,15 +160,15 @@ $result_trees{'center'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1394,9 +1394,9 @@ 
$result_trees{'center'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{
 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
-$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 $result_trees{'center'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'center'}{'contents'}[0]{'contents'}[2];
 $result_trees{'center'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'center'}{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl 
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index ba4964726f..6cba3355d4 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -108,19 +108,19 @@ $result_trees{'def_in_style_command'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'number' => 1
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -210,9 +210,9 @@ 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
diff --git 
a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl 
b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
index c9148cbc9d..3c74a71bb8 100644
--- a/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
@@ -129,19 +129,19 @@ $result_trees{'def_not_closed_in_menu_description'} = {
                               'name' => {}
                             },
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [
+                              'content_normalized' => [
                                 {}
                               ],
-                              'content_normalized' => [
+                              'entry_content' => [
                                 {}
                               ],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 1,
                               'index_at_command' => 'deffn',
                               'index_ignore_chars' => {},
                               'index_name' => 'fn',
-                              'index_type_command' => 'deffn',
-                              'number' => 1
+                              'index_type_command' => 'deffn'
                             },
                             'original_def_cmdname' => 'deffn'
                           },
@@ -270,9 +270,9 @@ 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index ba0e96b503..fc6da1f376 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -522,16 +522,16 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_node' => {},
+                                  'entry_number' => 1,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'node' => {},
-                                  'number' => 1
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -667,16 +667,16 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_node' => {},
+                                  'entry_number' => 2,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'node' => {},
-                                  'number' => 2
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -696,16 +696,16 @@ $result_trees{'in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -795,16 +795,16 @@ $result_trees{'in_table'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_node' => {},
+                                  'entry_number' => 3,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'node' => {},
-                                  'number' => 3
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -824,16 +824,16 @@ $result_trees{'in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -1104,10 +1104,10 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'in_table'}{'contents'}[1];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'contents'}[0];
@@ -1123,16 +1123,16 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'in_table'}{'contents'}[1];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'in_table'}{'contents'}[1];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -1145,16 +1145,16 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'in_table'}{'contents'}[1];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'in_table'}{'contents'}[1];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl 
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index 62836a0aab..3ad1c52ab0 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -75,15 +75,15 @@ $result_trees{'multitable_item_in_index'} = {
                   'cmdname' => 'vindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'vindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'vr',
-                      'index_type_command' => 'vindex',
-                      'number' => 1
+                      'index_type_command' => 'vindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -170,9 +170,9 @@ 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index cfc08ba298..94cc45c080 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -176,19 +176,19 @@ $result_trees{'on_def_line'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -365,19 +365,19 @@ $result_trees{'on_def_line'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 2
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffnx',
                 'spaces_before_argument' => ' '
@@ -458,9 +458,9 @@ 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
@@ -483,9 +483,9 @@ 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
+$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index 9b420cdcf4..55bb168787 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -146,15 +146,15 @@ $result_trees{'on_index_entry_line'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -192,9 +192,9 @@ 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'c
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7];
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0];
 $result_trees{'on_index_entry_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'on_index_entry_line'}{'contents'}[0];
 $result_trees{'on_index_entry_line'}{'contents'}[0]{'parent'} = 
$result_trees{'on_index_entry_line'};
 
diff --git a/tp/t/results/invalid_nestings/section_on_defx_line.pl 
b/tp/t/results/invalid_nestings/section_on_defx_line.pl
index 0b0d9c179f..e12088db81 100644
--- a/tp/t/results/invalid_nestings/section_on_defx_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_defx_line.pl
@@ -89,19 +89,19 @@ $result_trees{'section_on_defx_line'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -222,9 +222,9 @@ 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_on_defx_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index eec744e12c..ae29e01b25 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -125,15 +125,15 @@ $result_trees{'tab_in_index'} = {
                               'cmdname' => 'vindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 1,
                                   'in_code' => 1,
                                   'index_at_command' => 'vindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
-                                  'index_type_command' => 'vindex',
-                                  'number' => 1
+                                  'index_type_command' => 'vindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -249,9 +249,9 @@ 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 4dbc20a314..8fcfd9a63d 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -319,16 +319,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -467,16 +467,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 2,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 2
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -603,16 +603,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 3,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 3
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -752,16 +752,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 4,
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
-                          'index_type_command' => 'cindex',
-                          'node' => {},
-                          'number' => 4
+                          'index_type_command' => 'cindex'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -892,16 +892,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 5,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 5
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -951,16 +951,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 6,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 6
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -992,16 +992,16 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 7,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 7
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1144,10 +1144,10 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3];
@@ -1164,10 +1164,10 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
@@ -1182,10 +1182,10 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[6]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7];
@@ -1202,10 +1202,10 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9];
@@ -1221,26 +1221,26 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[10]
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index a46ddfdb23..dea061afbf 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -224,16 +224,16 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -373,16 +373,16 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 2,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 2
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -464,16 +464,16 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 3,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 3
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -621,16 +621,16 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 4,
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
-                          'index_type_command' => 'cindex',
-                          'node' => {},
-                          'number' => 4
+                          'index_type_command' => 'cindex'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -759,10 +759,10 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
@@ -779,10 +779,10 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'a
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
@@ -794,10 +794,10 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
@@ -815,10 +815,10 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5];
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 0bd6024892..42fe06ab7f 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -149,28 +149,28 @@ $result_trees{'multiple'} = {
                         },
                         'documentlanguage' => 'fr',
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {},
                             {
-                              'text' => ' de '
+                              'text' => ' of '
                             },
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {},
                             {
-                              'text' => ' of '
+                              'text' => ' de '
                             },
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 1,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defivar',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'defivar',
-                          'number' => 1,
-                          'region' => {}
+                          'index_type_command' => 'defivar'
                         },
                         'original_def_cmdname' => 'defivar'
                       },
@@ -537,28 +537,28 @@ $result_trees{'multiple'} = {
                 },
                 'documentlanguage' => 'fr',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' de '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' de '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -831,28 +831,28 @@ $result_trees{'multiple'} = {
                 },
                 'documentlanguage' => 'hr',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' od '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' od '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1026,12 +1026,12 @@ 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = $result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = $result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1077,12 +1077,12 @@ 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple'}{'contents'}[3];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple'}{'contents'}[3];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -1116,12 +1116,12 @@ 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple'}{'contents'}[3];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
+$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple'}{'contents'}[3];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index c3a15271fe..156781d294 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -149,28 +149,28 @@ $result_trees{'multiple_in_preamble'} = {
                         },
                         'documentlanguage' => 'fr',
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {},
                             {
-                              'text' => ' de '
+                              'text' => ' of '
                             },
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {},
                             {
-                              'text' => ' of '
+                              'text' => ' de '
                             },
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 1,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defivar',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'defivar',
-                          'number' => 1,
-                          'region' => {}
+                          'index_type_command' => 'defivar'
                         },
                         'original_def_cmdname' => 'defivar'
                       },
@@ -571,28 +571,28 @@ $result_trees{'multiple_in_preamble'} = {
                 },
                 'documentlanguage' => 'hr',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' od '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' od '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -807,28 +807,28 @@ $result_trees{'multiple_in_preamble'} = {
                 },
                 'documentlanguage' => 'de',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' von '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' von '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -910,12 +910,12 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -965,12 +965,12 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -997,12 +997,12 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
+$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[3];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 2ed58b8196..0d336fd388 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -149,28 +149,28 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                         },
                         'documentlanguage' => 'fr',
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [
+                          'content_normalized' => [
                             {},
                             {
-                              'text' => ' de '
+                              'text' => ' of '
                             },
                             {}
                           ],
-                          'content_normalized' => [
+                          'entry_content' => [
                             {},
                             {
-                              'text' => ' of '
+                              'text' => ' de '
                             },
                             {}
                           ],
+                          'entry_element' => {},
+                          'entry_number' => 1,
+                          'entry_region' => {},
                           'in_code' => 1,
                           'index_at_command' => 'defivar',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'defivar',
-                          'number' => 1,
-                          'region' => {}
+                          'index_type_command' => 'defivar'
                         },
                         'original_def_cmdname' => 'defivar'
                       },
@@ -623,28 +623,28 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                 },
                 'documentlanguage' => 'de',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' von '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' von '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -758,12 +758,12 @@ 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'region'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_region'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -820,12 +820,12 @@ 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_in_preamble_before_node'}{'contents'}[3];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_in_preamble_before_node'}{'contents'}[3];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 4955c9df62..be843fe172 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -784,28 +784,28 @@ $result_trees{'multiple_lang_chapters'} = {
                 },
                 'documentlanguage' => 'ja',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1103,28 +1103,28 @@ $result_trees{'multiple_lang_chapters'} = {
                 },
                 'documentlanguage' => 'en',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1377,28 +1377,28 @@ $result_trees{'multiple_lang_chapters'} = {
                 },
                 'documentlanguage' => 'fr_FR',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' de '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' de '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1835,12 +1835,12 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
@@ -1878,12 +1878,12 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[5];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
@@ -1913,12 +1913,12 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[7];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 18cc484039..af6872f06d 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -784,28 +784,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 },
                 'documentlanguage' => 'ja',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1103,28 +1103,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 },
                 'documentlanguage' => 'en',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1377,28 +1377,28 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                 },
                 'documentlanguage' => 'fr_FR',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' de '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' de '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1835,12 +1835,12 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
@@ -1878,12 +1878,12 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
@@ -1913,12 +1913,12 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[7];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 728438553f..10349c9ca5 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -755,28 +755,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 },
                 'documentlanguage' => 'ja',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1074,28 +1074,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 },
                 'documentlanguage' => 'en',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
                       'text' => ' of '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1348,28 +1348,28 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                 },
                 'documentlanguage' => 'fr_FR',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' de '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' de '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1803,12 +1803,12 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[3];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
@@ -1846,12 +1846,12 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
@@ -1881,12 +1881,12 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0];
+$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[7];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 251076be11..556a48cecd 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -169,28 +169,28 @@ $result_trees{'simple'} = {
                 },
                 'documentlanguage' => 'fr',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' de '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' de '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -288,12 +288,12 @@ 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'simple'}{'contents'}[1];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index cd7b836dcf..dae858615d 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -169,28 +169,28 @@ $result_trees{'unknown_region'} = {
                 },
                 'documentlanguage' => 'fr_NOWHERE',
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {},
                     {
-                      'text' => ' de '
+                      'text' => ' of '
                     },
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {},
                     {
-                      'text' => ' of '
+                      'text' => ' de '
                     },
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_ignore_chars' => {},
                   'index_name' => 'vr',
-                  'index_type_command' => 'defivar',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'defivar'
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -288,12 +288,12 @@ 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'ar
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'class'}
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
-$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[2]
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[2]
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'unknown_region'}{'contents'}[1];
+$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[2]
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'unknown_region'}{'contents'}[1];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index 8e48ad6db1..d07bcc1716 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -158,15 +158,15 @@ $result_trees{'brace_in_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -221,15 +221,15 @@ $result_trees{'brace_in_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -284,15 +284,15 @@ $result_trees{'brace_in_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -411,19 +411,19 @@ $result_trees{'brace_in_index'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'defun',
-                  'number' => 1
+                  'index_type_command' => 'defun'
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -520,27 +520,27 @@ 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'parent'} = $resul
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -558,9 +558,9 @@ 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'a
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 7b9a8633fc..e8c8ad4dab 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -305,18 +305,18 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' ',
             'subentry' => {
@@ -610,18 +610,18 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {
                 '\\' => 1
               },
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -679,9 +679,11 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {
@@ -689,8 +691,6 @@ $result_trees{'indices'} = {
               },
               'index_name' => 'cp',
               'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3,
               'sortas' => '\\cmd'
             },
             'sortas' => '\\cmd',
@@ -792,16 +792,16 @@ $result_trees{'indices'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -885,16 +885,16 @@ $result_trees{'indices'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1035,10 +1035,10 @@ 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[1];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[1];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'indices'}{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'}{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1086,10 +1086,10 @@ 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'parent'} = $result_trees
 $result_trees{'indices'}{'contents'}[4]{'contents'}[2] = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'subentry'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'indices'}{'contents'}[3];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0];
@@ -1097,10 +1097,10 @@ 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[4];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[4];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'indices'}{'contents'}[3];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[6];
@@ -1113,10 +1113,10 @@ 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[1]
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[8];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[8];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'indices'}{'contents'}[3];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0];
@@ -1128,10 +1128,10 @@ 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[3
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[3];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'parent'} = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[10];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[10];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'indices'}{'contents'}[3];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 $result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'parent'} = 
$result_trees{'indices'}{'contents'}[4];
 
$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'args'}[0];
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 9245bf7817..cce2d38b7a 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -211,16 +211,16 @@ $result_trees{'no_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -570,10 +570,10 @@ 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[1]{'parent'} = $result
 $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'no_monolithic'}{'contents'}[2];
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3];
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3];
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3];
+$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'no_monolithic'}{'contents'}[1];
 $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'no_monolithic'}{'contents'}[2];
 $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'no_monolithic'}{'contents'}[2];
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5];
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index 4e169165a4..7721c0ba37 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -124,16 +124,16 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -165,16 +165,16 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -206,16 +206,16 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -247,16 +247,16 @@ $result_trees{'backslash_in_arg'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -340,31 +340,31 @@ 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[1]{'parent'} = $res
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6];
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6];
+$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1];
 $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'backslash_in_arg'}{'contents'}[1];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'backslash_in_arg'}{'contents'}[1]{'contents'}[7];
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index a2bf5d8b70..36af645c79 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -647,16 +647,16 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
               'index_name' => 'truc',
-              'index_type_command' => 'trucindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'trucindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -782,16 +782,16 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'codeidxindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_ignore_chars' => {},
               'index_name' => 'codeidx',
-              'index_type_command' => 'codeidxindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'codeidxindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -829,16 +829,16 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
               'index_name' => 'ky',
-              'index_type_command' => 'kindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'kindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -870,16 +870,16 @@ $result_trees{'macro_in_index_commands'} = {
           'cmdname' => 'pindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_ignore_chars' => {},
               'index_name' => 'pg',
-              'index_type_command' => 'pindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'pindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1091,10 +1091,10 @@ 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'args'}[0]{'parent'} = $
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
@@ -1112,25 +1112,25 @@ 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6];
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6];
+$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1];
 
$result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_index_commands'}{'contents'}[1]{'contents'}[8];
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index 2b3af3d221..bc1e972174 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -101,20 +101,20 @@ $result_trees{'menu_in_deffn'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -325,10 +325,10 @@ 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'arg
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
+$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl 
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 7c3d584811..36a89989a0 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -433,16 +433,16 @@ $result_trees{'comment_space_command_on_line'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -823,10 +823,10 @@ 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'ar
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'};
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5];
-$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5];
-$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[3];
+$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5];
+$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[3];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[7]{'args'}[0];
diff --git a/tp/t/results/misc_commands/index_entries.pl 
b/tp/t/results/misc_commands/index_entries.pl
index f72f826d33..8506d23e76 100644
--- a/tp/t/results/misc_commands/index_entries.pl
+++ b/tp/t/results/misc_commands/index_entries.pl
@@ -29,15 +29,15 @@ $result_trees{'index_entries'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -112,15 +112,15 @@ $result_trees{'index_entries'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
               'index_name' => 'truc',
-              'index_type_command' => 'trucindex',
-              'number' => 1
+              'index_type_command' => 'trucindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -141,9 +141,9 @@ $result_trees{'index_entries'} = {
 };
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[0];
-$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[0];
 $result_trees{'index_entries'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'index_entries'}{'contents'}[0];
 $result_trees{'index_entries'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'index_entries'}{'contents'}[0];
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -152,9 +152,9 @@ 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[2]{'parent'} = $result
 $result_trees{'index_entries'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'index_entries'}{'contents'}[0];
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[4];
-$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[4];
-$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_entries'}{'contents'}[0]{'contents'}[4];
 $result_trees{'index_entries'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'index_entries'}{'contents'}[0];
 $result_trees{'index_entries'}{'contents'}[0]{'parent'} = 
$result_trees{'index_entries'};
 
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 90d5011cc1..a11444472e 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -1356,16 +1356,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1397,16 +1397,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1438,16 +1438,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1479,16 +1479,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1520,16 +1520,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1561,16 +1561,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1602,16 +1602,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1643,16 +1643,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1684,16 +1684,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1725,16 +1725,16 @@ $result_trees{'formatting_fr'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -3679,73 +3679,73 @@ 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'parent'} = $resul
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[18]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[19]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[20]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[22]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[23]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[24]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26];
+$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'formatting_fr'}{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[26]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[27]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 40d5f2857e..43aee8f064 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -1356,16 +1356,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1397,16 +1397,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1438,16 +1438,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1479,16 +1479,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1520,16 +1520,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1561,16 +1561,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1602,16 +1602,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1643,16 +1643,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1684,16 +1684,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1725,16 +1725,16 @@ $result_trees{'texi_formatting'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -3679,73 +3679,73 @@ 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'parent'} = $res
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[18]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[19]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[20]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[22]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[23]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[24]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'args'}[0]{'contents'};
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26];
+$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'texi_formatting'}{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[26]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[27]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index 4cb073d2fc..92fb0acfde 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -75,16 +75,16 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -139,16 +139,16 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -365,16 +365,16 @@ $result_trees{'double_index_entry'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -473,10 +473,10 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'parent'} = $resul
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3];
@@ -484,10 +484,10 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'} = $r
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7];
@@ -518,10 +518,10 @@ 
$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'parent'} = $resul
 $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
 $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
 $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/moreindices/index_no_node.pl 
b/tp/t/results/moreindices/index_no_node.pl
index 82e49cd8a1..4efe525faa 100644
--- a/tp/t/results/moreindices/index_no_node.pl
+++ b/tp/t/results/moreindices/index_no_node.pl
@@ -94,15 +94,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -245,15 +245,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -292,15 +292,15 @@ $result_trees{'index_no_node'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 3
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -415,15 +415,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -455,15 +455,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -495,15 +495,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -535,15 +535,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -575,15 +575,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -615,15 +615,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -709,15 +709,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -828,15 +828,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -875,15 +875,15 @@ $result_trees{'index_no_node'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 12,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 12
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -986,15 +986,15 @@ $result_trees{'index_no_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1070,15 +1070,15 @@ $result_trees{'index_no_node'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 14,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 14
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1190,9 +1190,9 @@ 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'par
 $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[0];
 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2];
 $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[0];
 
$result_trees{'index_no_node'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[3];
 $result_trees{'index_no_node'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[0];
@@ -1210,16 +1210,16 @@ 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[0]{'parent'} = $result
 $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[1];
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2];
 $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[1];
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3];
 $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[1];
 $result_trees{'index_no_node'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[1];
@@ -1233,39 +1233,39 @@ 
$result_trees{'index_no_node'}{'contents'}[2]{'args'}[0]{'parent'} = $result_tre
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[7];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
@@ -1276,9 +1276,9 @@ 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[9]{'parent'} = $result
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11];
-$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[11]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[12]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
 $result_trees{'index_no_node'}{'contents'}[2]{'contents'}[13]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[2];
@@ -1291,16 +1291,16 @@ 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'
 $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[3];
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2];
-$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2];
 $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[3];
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3];
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3];
 $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[3]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[3];
 $result_trees{'index_no_node'}{'contents'}[3]{'contents'}[4]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[3];
@@ -1312,9 +1312,9 @@ 
$result_trees{'index_no_node'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'
 $result_trees{'index_no_node'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[4];
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0];
 $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[4];
 $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[4];
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[2]{'args'}[0];
@@ -1323,9 +1323,9 @@ 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[2]{'parent'} = $result
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3];
 $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[4];
 $result_trees{'index_no_node'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'index_no_node'}{'contents'}[4];
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index c12c5ced6a..3d9a458b34 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -158,16 +158,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -603,16 +603,16 @@ $result_trees{'index_split'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -644,16 +644,16 @@ $result_trees{'index_split'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -685,16 +685,16 @@ $result_trees{'index_split'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -726,16 +726,16 @@ $result_trees{'index_split'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -851,16 +851,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -941,16 +941,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -982,16 +982,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1023,16 +1023,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1545,16 +1545,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1810,16 +1810,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2044,16 +2044,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2128,16 +2128,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2345,16 +2345,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2489,16 +2489,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2626,16 +2626,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2721,16 +2721,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2805,16 +2805,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2927,16 +2927,16 @@ $result_trees{'index_split'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -3112,10 +3112,10 @@ 
$result_trees{'index_split'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 $result_trees{'index_split'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[2];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[2]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[1];
 $result_trees{'index_split'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[2];
 $result_trees{'index_split'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[2];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[2]{'args'}[0];
@@ -3176,31 +3176,31 @@ 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[0]{'parent'} = $result_t
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[1];
 $result_trees{'index_split'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[3];
@@ -3214,10 +3214,10 @@ 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[5]{'parent'} = $result_t
 $result_trees{'index_split'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'index_split'}{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[3]{'contents'}[7];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[7];
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[3]{'contents'}[7];
+$result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[3]{'contents'}[8]{'parent'} = 
$result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -3227,24 +3227,24 @@ 
$result_trees{'index_split'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 $result_trees{'index_split'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[0];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[2];
+$result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 $result_trees{'index_split'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[4]{'contents'}[4];
@@ -3324,10 +3324,10 @@ 
$result_trees{'index_split'}{'contents'}[6]{'args'}[0]{'parent'} = $result_trees
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[6]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[5];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[5];
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[6]{'contents'}[3];
@@ -3364,10 +3364,10 @@ 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[6]{'parent'} = $result_t
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[7]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'parent'} 
= $result_trees{'index_split'}{'contents'}[6]{'contents'}[8];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[8];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[5];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[8];
+$result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[5];
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[8]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[9]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 $result_trees{'index_split'}{'contents'}[6]{'parent'} = 
$result_trees{'index_split'};
@@ -3396,10 +3396,10 @@ 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[1]{'parent'} = $result_
 $result_trees{'index_split'}{'contents'}[10]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[10];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[9];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[3];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[9];
 $result_trees{'index_split'}{'contents'}[10]{'contents'}[3]{'parent'} = 
$result_trees{'index_split'}{'contents'}[10];
 $result_trees{'index_split'}{'contents'}[10]{'contents'}[4]{'parent'} = 
$result_trees{'index_split'}{'contents'}[10];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[5]{'args'}[0];
@@ -3408,10 +3408,10 @@ 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[5]{'parent'} = $result_
 $result_trees{'index_split'}{'contents'}[10]{'contents'}[6]{'parent'} = 
$result_trees{'index_split'}{'contents'}[10];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[7];
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[7];
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[9];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[10]{'contents'}[7];
+$result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[9];
 $result_trees{'index_split'}{'contents'}[10]{'contents'}[7]{'parent'} = 
$result_trees{'index_split'}{'contents'}[10];
 $result_trees{'index_split'}{'contents'}[10]{'contents'}[8]{'parent'} = 
$result_trees{'index_split'}{'contents'}[10];
 $result_trees{'index_split'}{'contents'}[10]{'parent'} = 
$result_trees{'index_split'};
@@ -3437,10 +3437,10 @@ 
$result_trees{'index_split'}{'contents'}[14]{'args'}[0]{'parent'} = $result_tree
 $result_trees{'index_split'}{'contents'}[14]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[14];
 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[14]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[14]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[13];
+$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[14]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[13];
 $result_trees{'index_split'}{'contents'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[14];
 $result_trees{'index_split'}{'contents'}[14]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[14];
 
$result_trees{'index_split'}{'contents'}[14]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[14]{'contents'}[3]{'args'}[0];
@@ -3458,10 +3458,10 @@ 
$result_trees{'index_split'}{'contents'}[15]{'args'}[3]{'parent'} = $result_tree
 $result_trees{'index_split'}{'contents'}[15]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[15];
 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[15]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[15]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[15];
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[15]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[15];
 $result_trees{'index_split'}{'contents'}[15]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[15];
 
$result_trees{'index_split'}{'contents'}[15]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[15]{'contents'}[2];
 $result_trees{'index_split'}{'contents'}[15]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[15];
@@ -3480,10 +3480,10 @@ 
$result_trees{'index_split'}{'contents'}[16]{'args'}[3]{'parent'} = $result_tree
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[2];
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
@@ -3494,10 +3494,10 @@ 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[4]{'parent'} = $result_
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[5]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[6];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[6];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[6];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[6]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[7]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[8]{'args'}[0];
@@ -3506,10 +3506,10 @@ 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[8]{'parent'} = $result_
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[9]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[10];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[10];
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[16];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[16]{'contents'}[10];
+$result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[16];
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[10]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 $result_trees{'index_split'}{'contents'}[16]{'contents'}[11]{'parent'} = 
$result_trees{'index_split'}{'contents'}[16];
 $result_trees{'index_split'}{'contents'}[16]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[16]{'args'}[0]{'contents'}[0];
@@ -3525,10 +3525,10 @@ 
$result_trees{'index_split'}{'contents'}[17]{'args'}[3]{'parent'} = $result_tree
 $result_trees{'index_split'}{'contents'}[17]{'contents'}[0]{'parent'} = 
$result_trees{'index_split'}{'contents'}[17];
 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[17]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split'}{'contents'}[17]{'contents'}[1];
-$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split'}{'contents'}[17];
+$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split'}{'contents'}[17]{'contents'}[1];
+$result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split'}{'contents'}[17];
 $result_trees{'index_split'}{'contents'}[17]{'contents'}[1]{'parent'} = 
$result_trees{'index_split'}{'contents'}[17];
 $result_trees{'index_split'}{'contents'}[17]{'contents'}[2]{'parent'} = 
$result_trees{'index_split'}{'contents'}[17];
 $result_trees{'index_split'}{'contents'}[17]{'extra'}{'node_content'}[0] = 
$result_trees{'index_split'}{'contents'}[17]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index ae96ec22ae..8d4a9f9d09 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -158,16 +158,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -603,16 +603,16 @@ $result_trees{'index_split_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -644,16 +644,16 @@ $result_trees{'index_split_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -685,16 +685,16 @@ $result_trees{'index_split_nodes'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -726,16 +726,16 @@ $result_trees{'index_split_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -851,16 +851,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -941,16 +941,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -982,16 +982,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1023,16 +1023,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1545,16 +1545,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1810,16 +1810,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2044,16 +2044,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2128,16 +2128,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2345,16 +2345,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2489,16 +2489,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2626,16 +2626,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 13,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 13
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2721,16 +2721,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 14,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 14
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2805,16 +2805,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 15,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 15
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2927,16 +2927,16 @@ $result_trees{'index_split_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 16,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 16
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -3112,10 +3112,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'par
 $result_trees{'index_split_nodes'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[2];
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0];
-$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0];
-$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0];
+$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[1];
 $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[2];
 $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[2];
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0];
@@ -3176,31 +3176,31 @@ 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[0]{'parent'} = $re
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1];
 $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[3];
@@ -3214,10 +3214,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[5]{'parent'} = $re
 $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[3];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7];
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7];
+$result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[3]{'contents'}[8]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] 
= $result_trees{'index_split_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -3227,24 +3227,24 @@ 
$result_trees{'index_split_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'par
 $result_trees{'index_split_nodes'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0];
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2];
+$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4];
@@ -3324,10 +3324,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[6]{'args'}[0]{'parent'} = $result
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[5];
+$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[5];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3];
@@ -3364,10 +3364,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[6]{'parent'} = $re
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[7]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8];
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8];
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[5];
+$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8];
+$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[5];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[8]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[9]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'parent'} = 
$result_trees{'index_split_nodes'};
@@ -3396,10 +3396,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[1]{'parent'} = $r
 $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[10];
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3];
-$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3];
-$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[9];
+$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3];
+$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[9];
 $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[3]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[10];
 $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[4]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[10];
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[5]{'args'}[0];
@@ -3408,10 +3408,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[5]{'parent'} = $r
 $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[6]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[10];
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7];
-$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7];
-$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[9];
+$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7];
+$result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[9];
 $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[7]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[10];
 $result_trees{'index_split_nodes'}{'contents'}[10]{'contents'}[8]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[10];
 $result_trees{'index_split_nodes'}{'contents'}[10]{'parent'} = 
$result_trees{'index_split_nodes'};
@@ -3437,10 +3437,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[14]{'args'}[0]{'parent'} = $resul
 $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[14];
 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[13];
+$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[13];
 $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[14];
 $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[14];
 
$result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[14]{'contents'}[3]{'args'}[0];
@@ -3458,10 +3458,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[15]{'args'}[3]{'parent'} = $resul
 $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[15];
 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[15];
+$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[15];
 $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[15];
 
$result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[2];
 $result_trees{'index_split_nodes'}{'contents'}[15]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[15];
@@ -3480,10 +3480,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[16]{'args'}[3]{'parent'} = $resul
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[16];
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[16];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[2];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
@@ -3494,10 +3494,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[4]{'parent'} = $r
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[5]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6];
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6];
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[16];
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6];
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[16];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[6]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[7]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[8]{'args'}[0];
@@ -3506,10 +3506,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[8]{'parent'} = $r
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[9]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10];
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10];
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[16];
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10];
+$result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[16];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[10]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'contents'}[11]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[16];
 $result_trees{'index_split_nodes'}{'contents'}[16]{'extra'}{'node_content'}[0] 
= $result_trees{'index_split_nodes'}{'contents'}[16]{'args'}[0]{'contents'}[0];
@@ -3525,10 +3525,10 @@ 
$result_trees{'index_split_nodes'}{'contents'}[17]{'args'}[3]{'parent'} = $resul
 $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[0]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[17];
 
$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1];
-$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'index_split_nodes'}{'contents'}[17];
+$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1];
+$result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'index_split_nodes'}{'contents'}[17];
 $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[1]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[17];
 $result_trees{'index_split_nodes'}{'contents'}[17]{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[17];
 $result_trees{'index_split_nodes'}{'contents'}[17]{'extra'}{'node_content'}[0] 
= $result_trees{'index_split_nodes'}{'contents'}[17]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/moreindices/nodes_before_top.pl 
b/tp/t/results/moreindices/nodes_before_top.pl
index 9fed47eb45..a313803704 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -161,16 +161,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -436,16 +436,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -525,16 +525,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -646,16 +646,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1016,16 +1016,16 @@ $result_trees{'nodes_before_top'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1057,16 +1057,16 @@ $result_trees{'nodes_before_top'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1098,16 +1098,16 @@ $result_trees{'nodes_before_top'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1668,16 +1668,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1709,16 +1709,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1750,16 +1750,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1882,16 +1882,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1966,16 +1966,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2007,16 +2007,16 @@ $result_trees{'nodes_before_top'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2145,10 +2145,10 @@ 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'pare
 $result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[3]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1];
@@ -2185,10 +2185,10 @@ 
$result_trees{'nodes_before_top'}{'contents'}[2]{'args'}[3]{'parent'} = $result_
 $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
 $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[2];
@@ -2198,10 +2198,10 @@ 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[3]{'parent'} = $res
 $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5];
+$result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[2];
 $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[2];
 $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[2];
 $result_trees{'nodes_before_top'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[2];
@@ -2216,10 +2216,10 @@ 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'contents'}[0]{'pare
 $result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[3];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[3];
 $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[3];
 $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[3];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[2]{'args'}[0];
@@ -2267,24 +2267,24 @@ 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[3]{'parent'} = $result_
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
+$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[4];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[4];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[4];
@@ -2363,24 +2363,24 @@ 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[3]{'parent'} = $result_
 $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[6];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[6];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[6];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3];
+$result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[6];
 $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[6];
 $result_trees{'nodes_before_top'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[6];
 $result_trees{'nodes_before_top'}{'contents'}[6]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -2397,10 +2397,10 @@ 
$result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'contents'}[0]{'pare
 $result_trees{'nodes_before_top'}{'contents'}[7]{'args'}[3]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[2]{'args'}[0];
@@ -2409,17 +2409,17 @@ 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[2]{'parent'} = $res
 $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[3]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[4]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5];
+$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top'}{'contents'}[7];
 $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[5]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[6]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[7];
 
$result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[7]{'contents'}[7]{'args'}[0];
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index 36965a3831..2905865197 100644
--- a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -161,16 +161,16 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -495,16 +495,16 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -595,16 +595,16 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -716,16 +716,16 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -946,16 +946,16 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1299,16 +1299,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1340,16 +1340,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1381,16 +1381,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 7,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 7
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1951,16 +1951,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1992,16 +1992,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2033,16 +2033,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2165,16 +2165,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2249,16 +2249,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2290,16 +2290,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 11,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 11
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2614,16 +2614,16 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 12,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 12
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2714,10 +2714,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[2];
@@ -2762,10 +2762,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
@@ -2777,10 +2777,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'conten
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[2];
@@ -2795,10 +2795,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
@@ -2825,10 +2825,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[2];
@@ -2881,24 +2881,24 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
@@ -2977,24 +2977,24 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -3011,10 +3011,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'args'}
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'args'}[3]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[2]{'args'}[0];
@@ -3023,17 +3023,17 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'conten
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[6]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[8]{'contents'}[7]{'args'}[0];
@@ -3075,10 +3075,10 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'args'
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1];
+$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
index 2736339d64..0a829aefc6 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -161,16 +161,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -436,16 +436,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -525,16 +525,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -646,16 +646,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1016,16 +1016,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1057,16 +1057,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1098,16 +1098,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1668,16 +1668,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1709,16 +1709,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1750,16 +1750,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1882,16 +1882,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1966,16 +1966,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2007,16 +2007,16 @@ $result_trees{'nodes_before_top_no_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2145,10 +2145,10 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'args'}[3]{'contents'}
 $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'args'}[3]{'parent'} 
= $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[1];
@@ -2185,10 +2185,10 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'args'}[3]{'parent'} =
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[2];
@@ -2198,10 +2198,10 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[3]{'parent
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[2];
@@ -2216,10 +2216,10 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'args'}[2]{'contents'}
 $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'args'}[2]{'parent'} 
= $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[2]{'args'}[0];
@@ -2267,24 +2267,24 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'args'}[3]{'parent'} =
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
@@ -2363,24 +2363,24 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'args'}[3]{'parent'} =
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -2397,10 +2397,10 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'args'}[3]{'contents'}
 $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'args'}[3]{'parent'} 
= $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[2]{'args'}[0];
@@ -2409,17 +2409,17 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[2]{'parent
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5];
+$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[6]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'contents'}[7]{'args'}[0];
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index f51ae96451..4c9a647c6c 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -161,16 +161,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -436,16 +436,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -525,16 +525,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -646,16 +646,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 4,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 4
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1016,16 +1016,16 @@ $result_trees{'nodes_before_top_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 5,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 5
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1057,16 +1057,16 @@ $result_trees{'nodes_before_top_nodes'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1098,16 +1098,16 @@ $result_trees{'nodes_before_top_nodes'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 6,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 6
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -1668,16 +1668,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1709,16 +1709,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1750,16 +1750,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1882,16 +1882,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1966,16 +1966,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2007,16 +2007,16 @@ $result_trees{'nodes_before_top_nodes'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 10,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 10
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -2145,10 +2145,10 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'args'}[3]{'contents'}[2]
 $result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'args'}[3]{'parent'} = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[1];
@@ -2185,10 +2185,10 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'args'}[3]{'parent'} = $r
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[2];
@@ -2198,10 +2198,10 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[3]{'parent'}
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[6]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[2]{'contents'}[7]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[2];
@@ -2216,10 +2216,10 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'args'}[2]{'contents'}[0]
 $result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[1]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[2]{'args'}[0];
@@ -2267,24 +2267,24 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'args'}[3]{'parent'} = $r
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
@@ -2363,24 +2363,24 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'args'}[3]{'parent'} = $r
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[3]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'contents'}[4]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[6];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -2397,10 +2397,10 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'args'}[3]{'contents'}[0]
 $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'args'}[3]{'parent'} = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[1]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[2]{'args'}[0];
@@ -2409,17 +2409,17 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[2]{'parent'}
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[3]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[4]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5];
+$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[5]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[6]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[7];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'contents'}[7]{'args'}[0];
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index 6033e8437a..6de056da36 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -157,16 +157,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -424,16 +424,16 @@ $result_trees{'split_chapter_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 2,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 2
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -465,16 +465,16 @@ $result_trees{'split_chapter_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 3,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 3
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -506,16 +506,16 @@ $result_trees{'split_chapter_index'} = {
               'cmdname' => 'findex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'findex',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'findex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -547,16 +547,16 @@ $result_trees{'split_chapter_index'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 4,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'node' => {},
-                  'number' => 4
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -635,16 +635,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 5,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 5
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -682,16 +682,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 2,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 2
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -723,16 +723,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 6,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 6
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -764,16 +764,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'findex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 3,
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_ignore_chars' => {},
               'index_name' => 'fn',
-              'index_type_command' => 'findex',
-              'node' => {},
-              'number' => 3
+              'index_type_command' => 'findex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1113,16 +1113,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 7,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 7
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1160,16 +1160,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 8,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 8
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1300,16 +1300,16 @@ $result_trees{'split_chapter_index'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 9,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'node' => {},
-              'number' => 9
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -1372,10 +1372,10 @@ 
$result_trees{'split_chapter_index'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'p
 $result_trees{'split_chapter_index'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[2];
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0];
-$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[1];
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0];
+$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[1];
 $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[2];
 $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[2];
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[2];
@@ -1410,31 +1410,31 @@ 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[0]{'parent'} = $
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
@@ -1444,32 +1444,32 @@ 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[3]{'parent'} = $
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9];
+$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[3];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[4];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[10]{'parent'} 
= $result_trees{'split_chapter_index'}{'contents'}[4];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11];
@@ -1515,18 +1515,18 @@ 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'parent'} = $
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5];
+$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[5];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[5]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[6]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'parent'} = 
$result_trees{'split_chapter_index'};
@@ -1543,10 +1543,10 @@ 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[1]{'parent'} = $
 $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[8];
 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3];
-$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'split_chapter_index'}{'contents'}[7];
+$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3];
+$result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'split_chapter_index'}{'contents'}[7];
 $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[3]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[8];
 $result_trees{'split_chapter_index'}{'contents'}[8]{'contents'}[4]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[8];
 $result_trees{'split_chapter_index'}{'contents'}[8]{'parent'} = 
$result_trees{'split_chapter_index'};
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 8556c57e70..b4f8ace827 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -654,15 +654,15 @@ $result_trees{'placed_things_before_element'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -935,9 +935,9 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'pa
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'};
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 $result_trees{'placed_things_before_element'}{'contents'}[0]{'parent'} = 
$result_trees{'placed_things_before_element'};
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl 
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 686f878413..8e523aeb88 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -113,15 +113,15 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -544,15 +544,15 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                               'cmdname' => 'cindex',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 2,
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'cp',
-                                  'index_type_command' => 'cindex',
-                                  'number' => 2
+                                  'index_type_command' => 'cindex'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -731,15 +731,15 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                       'cmdname' => 'cindex',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 3,
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_ignore_chars' => {},
                           'index_name' => 'cp',
-                          'index_type_command' => 'cindex',
-                          'number' => 3
+                          'index_type_command' => 'cindex'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -879,9 +879,9 @@ 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -933,9 +933,9 @@ 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
@@ -958,9 +958,9 @@ 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4];
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index b762d97d32..79c186a86a 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -459,15 +459,15 @@ $result_trees{'at_commands_glued_in_example'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'number' => 1
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -598,9 +598,9 @@ 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[39]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'args'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40];
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40];
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'};
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'args'}[0]{'contents'};
+$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[40]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index dec0ee52cc..881e1c03d5 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -452,15 +452,15 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
               'cmdname' => 'cindex',
               'extra' => {
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [],
                   'content_normalized' => [],
+                  'entry_content' => [],
+                  'entry_element' => {},
+                  'entry_number' => 1,
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_ignore_chars' => {},
                   'index_name' => 'cp',
-                  'index_type_command' => 'cindex',
-                  'number' => 1
+                  'index_type_command' => 'cindex'
                 },
                 'spaces_before_argument' => ' '
               },
@@ -554,9 +554,9 @@ 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'c
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
-$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
-$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0];
 $result_trees{'at_commands_glued_in_paragraph'}{'contents'}[0]{'parent'} = 
$result_trees{'at_commands_glued_in_paragraph'};
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index a449081b00..c6f41264dc 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -93,19 +93,19 @@ $result_trees{'def_in_example'} = {
                       'name' => {}
                     },
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [
+                      'content_normalized' => [
                         {}
                       ],
-                      'content_normalized' => [
+                      'entry_content' => [
                         {}
                       ],
+                      'entry_element' => {},
+                      'entry_number' => 1,
                       'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_ignore_chars' => {},
                       'index_name' => 'fn',
-                      'index_type_command' => 'defun',
-                      'number' => 1
+                      'index_type_command' => 'defun'
                     },
                     'original_def_cmdname' => 'defun'
                   },
@@ -229,9 +229,9 @@ 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index 11ab641e06..ba29ada42f 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -632,15 +632,15 @@ $result_trees{'no_element'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -751,9 +751,9 @@ 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'parent'} = $result_t
 $result_trees{'no_element'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'no_element'}{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'parent'} 
= $result_trees{'no_element'}{'contents'}[0]{'contents'}[19];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[19];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'};
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'};
+$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[19];
 $result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'no_element'}{'contents'}[0];
 $result_trees{'no_element'}{'contents'}[0]{'parent'} = 
$result_trees{'no_element'};
 
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 396e0a68e3..9257a587c9 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -561,15 +561,15 @@ $result_trees{'placed_things_before_element'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -812,9 +812,9 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'pa
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 $result_trees{'placed_things_before_element'}{'contents'}[0]{'parent'} = 
$result_trees{'placed_things_before_element'};
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index c57b937f98..16451d9adb 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -561,15 +561,15 @@ $result_trees{'placed_things_before_node'} = {
           'cmdname' => 'cindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_ignore_chars' => {},
               'index_name' => 'cp',
-              'index_type_command' => 'cindex',
-              'number' => 1
+              'index_type_command' => 'cindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -852,9 +852,9 @@ 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'paren
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'};
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
 $result_trees{'placed_things_before_node'}{'contents'}[0]{'parent'} = 
$result_trees{'placed_things_before_node'};
diff --git a/tp/t/results/value/value_in_index_commands.pl 
b/tp/t/results/value/value_in_index_commands.pl
index 111f6514a9..4f71c437f4 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -416,16 +416,16 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'trucindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_ignore_chars' => {},
               'index_name' => 'truc',
-              'index_type_command' => 'trucindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'trucindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -551,16 +551,16 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'codeidxindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_ignore_chars' => {},
               'index_name' => 'codeidx',
-              'index_type_command' => 'codeidxindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'codeidxindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -598,16 +598,16 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'kindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_ignore_chars' => {},
               'index_name' => 'ky',
-              'index_type_command' => 'kindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'kindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -639,16 +639,16 @@ $result_trees{'value_in_index_commands'} = {
           'cmdname' => 'pindex',
           'extra' => {
             'index_entry' => {
-              'command' => {},
-              'content' => [],
               'content_normalized' => [],
+              'entry_content' => [],
+              'entry_element' => {},
+              'entry_node' => {},
+              'entry_number' => 1,
               'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_ignore_chars' => {},
               'index_name' => 'pg',
-              'index_type_command' => 'pindex',
-              'node' => {},
-              'number' => 1
+              'index_type_command' => 'pindex'
             },
             'spaces_before_argument' => ' '
           },
@@ -833,10 +833,10 @@ 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'args'}[0]{'parent'} = $
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
@@ -854,25 +854,25 @@ 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6];
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6];
+$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1];
 
$result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_index_commands'}{'contents'}[1]{'contents'}[8];
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 219149382b..3600a5c8d6 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1656,20 +1656,20 @@ $result_trees{'commands_and_spaces'} = {
                   'name' => {}
                 },
                 'index_entry' => {
-                  'command' => {},
-                  'content' => [
+                  'content_normalized' => [
                     {}
                   ],
-                  'content_normalized' => [
+                  'entry_content' => [
                     {}
                   ],
+                  'entry_element' => {},
+                  'entry_node' => {},
+                  'entry_number' => 1,
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_ignore_chars' => {},
                   'index_name' => 'fn',
-                  'index_type_command' => 'deffn',
-                  'node' => {},
-                  'number' => 1
+                  'index_type_command' => 'deffn'
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -2004,10 +2004,10 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[1]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[1];
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index 878149b7c0..27c665cb3e 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -701,16 +701,16 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -761,16 +761,16 @@ $result_trees{'block_commands_in_table'} = {
                           'cmdname' => 'vindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 2,
                               'in_code' => 1,
                               'index_at_command' => 'vindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vindex',
-                              'node' => {},
-                              'number' => 2
+                              'index_type_command' => 'vindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -806,16 +806,16 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 3
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -947,16 +947,16 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 4,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 4
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -999,16 +999,16 @@ $result_trees{'block_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 5,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 5
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -1405,27 +1405,27 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1];
@@ -1442,19 +1442,19 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'block_commands_in_table'}{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index 0953302e3d..26202ef8ad 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -87,15 +87,15 @@ $result_trees{'empty_item_itemx'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -148,15 +148,15 @@ $result_trees{'empty_item_itemx'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'number' => 2
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -233,15 +233,15 @@ $result_trees{'empty_item_itemx'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'number' => 3
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -317,17 +317,17 @@ 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
@@ -337,9 +337,9 @@ 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl 
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index b189ad9f2b..abb8765110 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -232,16 +232,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -373,16 +373,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -437,16 +437,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'vr',
-                          'index_type_command' => 'vtable',
-                          'node' => {},
-                          'number' => 3
+                          'index_type_command' => 'vtable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -578,16 +578,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 1,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 1
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -620,16 +620,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                           'cmdname' => 'cindex',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_node' => {},
+                              'entry_number' => 1,
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_ignore_chars' => {},
                               'index_name' => 'cp',
-                              'index_type_command' => 'cindex',
-                              'node' => {},
-                              'number' => 1
+                              'index_type_command' => 'cindex'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -701,16 +701,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 2,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 2
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -770,16 +770,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'item',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 3,
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 3
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -846,16 +846,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                       'cmdname' => 'itemx',
                       'extra' => {
                         'index_entry' => {
-                          'command' => {},
-                          'content' => [],
                           'content_normalized' => [],
+                          'entry_content' => [],
+                          'entry_element' => {},
+                          'entry_node' => {},
+                          'entry_number' => 4,
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_ignore_chars' => {},
                           'index_name' => 'fn',
-                          'index_type_command' => 'ftable',
-                          'node' => {},
-                          'number' => 4
+                          'index_type_command' => 'ftable'
                         },
                         'spaces_before_argument' => ' '
                       },
@@ -998,16 +998,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 2,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 2
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1192,16 +1192,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 3,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 3
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1362,16 +1362,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 4,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 4
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1556,16 +1556,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 5,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 5
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1732,16 +1732,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 6,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 6
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -1897,16 +1897,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 7,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 7
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -2068,16 +2068,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 8,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 8
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -2227,16 +2227,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 9,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 9
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -2286,16 +2286,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 10,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 10
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -2327,16 +2327,16 @@ $result_trees{'inter_item_commands_in_table'} = {
                   'cmdname' => 'cindex',
                   'extra' => {
                     'index_entry' => {
-                      'command' => {},
-                      'content' => [],
                       'content_normalized' => [],
+                      'entry_content' => [],
+                      'entry_element' => {},
+                      'entry_node' => {},
+                      'entry_number' => 11,
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_ignore_chars' => {},
                       'index_name' => 'cp',
-                      'index_type_command' => 'cindex',
-                      'node' => {},
-                      'number' => 11
+                      'index_type_command' => 'cindex'
                     },
                     'spaces_before_argument' => ' '
                   },
@@ -2485,10 +2485,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -2505,20 +2505,20 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'arg
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -2535,17 +2535,17 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'arg
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -2554,10 +2554,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -2566,10 +2566,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
@@ -2578,10 +2578,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1];
@@ -2599,10 +2599,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'arg
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
@@ -2625,10 +2625,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'arg
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0];
@@ -2648,10 +2648,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'ar
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0];
@@ -2674,10 +2674,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'ar
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0];
@@ -2698,10 +2698,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'ar
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15];
@@ -2720,10 +2720,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'ar
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17];
@@ -2743,10 +2743,10 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'ar
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -2764,26 +2764,26 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'ar
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index 0c62363ba6..a7d2a0fb71 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -108,15 +108,15 @@ $result_trees{'inter_item_commands_in_table_in_example'} 
= {
                                   'cmdname' => 'cindex',
                                   'extra' => {
                                     'index_entry' => {
-                                      'command' => {},
-                                      'content' => [],
                                       'content_normalized' => [],
+                                      'entry_content' => [],
+                                      'entry_element' => {},
+                                      'entry_number' => 1,
                                       'in_code' => 0,
                                       'index_at_command' => 'cindex',
                                       'index_ignore_chars' => {},
                                       'index_name' => 'cp',
-                                      'index_type_command' => 'cindex',
-                                      'number' => 1
+                                      'index_type_command' => 'cindex'
                                     },
                                     'spaces_before_argument' => ' '
                                   },
@@ -405,9 +405,9 @@ 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'content
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 6a67bab0e1..d137326799 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -265,15 +265,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 1,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 1
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -304,15 +304,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'itemx',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 2,
                               'in_code' => 1,
                               'index_at_command' => 'itemx',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 2
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -384,15 +384,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 3,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 3
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -464,15 +464,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 4,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 4
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -856,15 +856,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 5,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 5
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -895,15 +895,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'itemx',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 6,
                               'in_code' => 1,
                               'index_at_command' => 'itemx',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 6
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -975,15 +975,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 7,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 7
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1055,15 +1055,15 @@ $result_trees{'table_nested'} = {
                           'cmdname' => 'item',
                           'extra' => {
                             'index_entry' => {
-                              'command' => {},
-                              'content' => [],
                               'content_normalized' => [],
+                              'entry_content' => [],
+                              'entry_element' => {},
+                              'entry_number' => 8,
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_ignore_chars' => {},
                               'index_name' => 'vr',
-                              'index_type_command' => 'vtable',
-                              'number' => 8
+                              'index_type_command' => 'vtable'
                             },
                             'spaces_before_argument' => ' '
                           },
@@ -1460,15 +1460,15 @@ $result_trees{'table_nested'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 9,
                                   'in_code' => 1,
                                   'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
-                                  'index_type_command' => 'vtable',
-                                  'number' => 9
+                                  'index_type_command' => 'vtable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -1499,15 +1499,15 @@ $result_trees{'table_nested'} = {
                               'cmdname' => 'itemx',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 10,
                                   'in_code' => 1,
                                   'index_at_command' => 'itemx',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
-                                  'index_type_command' => 'vtable',
-                                  'number' => 10
+                                  'index_type_command' => 'vtable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -1579,15 +1579,15 @@ $result_trees{'table_nested'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 11,
                                   'in_code' => 1,
                                   'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
-                                  'index_type_command' => 'vtable',
-                                  'number' => 11
+                                  'index_type_command' => 'vtable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -1659,15 +1659,15 @@ $result_trees{'table_nested'} = {
                               'cmdname' => 'item',
                               'extra' => {
                                 'index_entry' => {
-                                  'command' => {},
-                                  'content' => [],
                                   'content_normalized' => [],
+                                  'entry_content' => [],
+                                  'entry_element' => {},
+                                  'entry_number' => 12,
                                   'in_code' => 1,
                                   'index_at_command' => 'item',
                                   'index_ignore_chars' => {},
                                   'index_name' => 'vr',
-                                  'index_type_command' => 'vtable',
-                                  'number' => 12
+                                  'index_type_command' => 'vtable'
                                 },
                                 'spaces_before_argument' => ' '
                               },
@@ -2050,15 +2050,15 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -2069,9 +2069,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
@@ -2082,9 +2082,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
@@ -2133,15 +2133,15 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -2152,9 +2152,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -2165,9 +2165,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
@@ -2217,15 +2217,15 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
@@ -2236,9 +2236,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
@@ -2249,9 +2249,9 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_content'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'};
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'entry_element'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];



reply via email to

[Prev in Thread] Current Thread [Next in Thread]